This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-12-08 10:16:13 +08:00
parent 7286eac99e
commit 112de07f06
2 changed files with 78 additions and 22 deletions

View File

@ -1654,10 +1654,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
OnKeyPress = MJstr3KeyPress
end
object BTPrint: TButton
Left = 10
Top = 471
Width = 99
Height = 66
Left = 178
Top = 615
Width = 79
Height = 34
Caption = #25552#20132
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
@ -1666,6 +1666,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Font.Style = [fsBold]
ParentFont = False
TabOrder = 19
Visible = False
OnClick = BTPrintClick
end
object Edit3: TEdit
@ -1830,9 +1831,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Font.Style = [fsBold]
ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
ItemHeight = 27
ItemIndex = 1
ParentFont = False
TabOrder = 15
Text = '1'
Text = '2'
Items.Strings = (
'1'
'2'
@ -2229,10 +2231,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
OnKeyPress = MJstr3KeyPress
end
object Button5: TButton
Left = 126
Top = 470
Width = 151
Height = 139
Left = 14
Top = 606
Width = 131
Height = 35
Caption = #25552#20132#31859#25968
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
@ -2241,13 +2243,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Font.Style = [fsBold]
ParentFont = False
TabOrder = 39
Visible = False
OnClick = Button5Click
end
object Button14: TButton
Left = 305
Top = 470
Width = 163
Height = 139
Left = 393
Top = 632
Width = 80
Height = 41
Caption = #25552#20132#37325#37327
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
@ -2256,6 +2259,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Font.Style = [fsBold]
ParentFont = False
TabOrder = 40
Visible = False
OnClick = Button14Click
end
object note: TEdit
@ -2371,6 +2375,54 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
#39068#33394
#32568#21495)
end
object cxButton1: TcxButton
Left = 152
Top = 480
Width = 145
Height = 129
Caption = #25552#20132#31859#25968
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
Font.Height = -19
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
TabOrder = 48
OnClick = Button5Click
Colors.Pressed = clRed
end
object cxButton2: TcxButton
Left = 24
Top = 488
Width = 105
Height = 57
Caption = #25552#20132
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
Font.Height = -19
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
TabOrder = 49
OnClick = BTPrintClick
Colors.Pressed = clRed
end
object cxButton3: TcxButton
Left = 312
Top = 480
Width = 153
Height = 129
Caption = #25552#20132#37325#37327
Font.Charset = GB2312_CHARSET
Font.Color = clWindowText
Font.Height = -19
Font.Name = #23435#20307
Font.Style = [fsBold]
ParentFont = False
TabOrder = 50
OnClick = Button14Click
Colors.Pressed = clRed
end
end
object MovePanel1: TMovePanel
Left = 1406
@ -3517,6 +3569,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
ParentFont = False
ReadOnly = True
TabOrder = 9
Text = #8730
OnClick = Edit5Click
end
object Edit13: TEdit

View File

@ -24,7 +24,7 @@ uses
dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
dxSkinscxPCPainter;
dxSkinscxPCPainter, Menus, cxButtons;
type
TfrmMJManageNewFDNewSF = class(TForm)
@ -343,6 +343,9 @@ type
Button18: TButton;
Button19: TButton;
ComboBox3: TComboBox;
cxButton1: TcxButton;
cxButton2: TcxButton;
cxButton3: TcxButton;
procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
@ -2751,7 +2754,7 @@ begin
sql.Add(' else isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID ),0) end ');
sql.Add('from JYOrder_Sub C');
SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
SQL.Add('left join WFB_MJJY A on A.MainId=A.MainId ');
SQL.Add('left join WFB_MJJY A on A.MainId=A.MainId and A.subid=C.subid ');
sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
// SQL.Add('and A.dingdanhao=''' + trim(dingdanhao.text) + ''' ');
// sql.Add('and A.FillTime>=getdate()-1');
@ -3746,14 +3749,14 @@ begin
begin
// Y1 := false;
PState := 33;
if Edit9.text <> '' then
begin
if (strtofloatdef(trim(MJMaoZ.Text), 0) = 0) then
// if Edit9.text <> '' then
// begin
if (strtofloatdef(trim(MJMaoZ.Text), 0) <= 0) or (strtofloatdef(trim(MJQty4.Text), 0) <= 0) then
begin
application.MessageBox('重量不能为零!', '提示信息', 0);
exit;
end;
end;
// end;
with ADOQuery1 do
begin