This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-11-21 09:36:42 +08:00
parent da4befd5b4
commit 356aade20f
3 changed files with 67 additions and 54 deletions

View File

@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1384 Width = 1384
Height = 62 Height = 92
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 119 ButtonWidth = 119
@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Top = 0 Top = 0
Caption = #25209#37327#20462#25913#32568#21495 Caption = #25209#37327#20462#25913#32568#21495
ImageIndex = 54 ImageIndex = 54
Wrap = True
OnClick = ToolButton11Click OnClick = ToolButton11Click
end end
object TBDW: TToolButton object TBDW: TToolButton
Left = 608 Left = 0
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #20462#25913#25968#37327#21333#20301 Caption = #20462#25913#25968#37327#21333#20301
ImageIndex = 54 ImageIndex = 54
OnClick = TBDWClick OnClick = TBDWClick
end end
object ToolButton4: TToolButton object ToolButton4: TToolButton
Left = 719 Left = 111
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #25209#37327#35843#25972#31859#25968 Caption = #25209#37327#35843#25972#31859#25968
ImageIndex = 54 ImageIndex = 54
OnClick = ToolButton4Click OnClick = ToolButton4Click
end end
object ToolButton13: TToolButton object ToolButton13: TToolButton
Left = 830 Left = 222
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #25209#37327#20928#37325#36716#38271#24230 Caption = #25209#37327#20928#37325#36716#38271#24230
ImageIndex = 54 ImageIndex = 54
@ -129,24 +130,23 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = ToolButton13Click OnClick = ToolButton13Click
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 953 Left = 345
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #25209#37327#20462#25913#30382#37325 Caption = #25209#37327#20462#25913#30382#37325
ImageIndex = 54 ImageIndex = 54
OnClick = ToolButton8Click OnClick = ToolButton8Click
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 1064 Left = 456
Top = 0 Top = 30
AutoSize = True AutoSize = True
Caption = #25171#21360#26631#31614 Caption = #25171#21360#26631#31614
ImageIndex = 96 ImageIndex = 96
Wrap = True
OnClick = ToolButton1Click OnClick = ToolButton1Click
end end
object TCPDB: TToolButton object TCPDB: TToolButton
Left = 0 Left = 543
Top = 30 Top = 30
AutoSize = True AutoSize = True
Caption = #25104#21697#25171#21253 Caption = #25104#21697#25171#21253
@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = TCPDBClick OnClick = TCPDBClick
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 87 Left = 630
Top = 30 Top = 30
AutoSize = True AutoSize = True
Caption = #25171#21360#21253#26631#31614 Caption = #25171#21360#21253#26631#31614
@ -163,24 +163,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = ToolButton3Click OnClick = ToolButton3Click
end end
object ToolButton2: TToolButton object ToolButton2: TToolButton
Left = 186 Left = 729
Top = 30 Top = 30
AutoSize = True AutoSize = True
Caption = #25171#21360#26816#39564#25253#21578 Caption = #25171#21360#26816#39564#25253#21578
ImageIndex = 12 ImageIndex = 12
Wrap = True
OnClick = ToolButton2Click OnClick = ToolButton2Click
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 297 Left = 0
Top = 30 Top = 60
AutoSize = True AutoSize = True
Caption = #25171#21360 Caption = #25171#21360
ImageIndex = 12 ImageIndex = 12
OnClick = ToolButton5Click OnClick = ToolButton5Click
end end
object Edit3: TEdit object Edit3: TEdit
Left = 360 Left = 63
Top = 30 Top = 60
Width = 68 Width = 68
Height = 30 Height = 30
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -194,8 +195,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnKeyPress = Edit3KeyPress OnKeyPress = Edit3KeyPress
end end
object ComboBox1: TComboBox object ComboBox1: TComboBox
Left = 428 Left = 131
Top = 33 Top = 63
Width = 149 Width = 149
Height = 24 Height = 24
Style = csDropDownList Style = csDropDownList
@ -219,8 +220,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
#26816#39564#30721#21333) #26816#39564#30721#21333)
end end
object Edit4: TEdit object Edit4: TEdit
Left = 577 Left = 280
Top = 30 Top = 60
Width = 121 Width = 121
Height = 30 Height = 30
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -233,40 +234,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Visible = False Visible = False
end end
object ToolButton12: TToolButton object ToolButton12: TToolButton
Left = 698 Left = 401
Top = 30 Top = 60
Caption = #20462#25913#30721#21333 Caption = #20462#25913#30721#21333
ImageIndex = 54 ImageIndex = 54
Visible = False Visible = False
OnClick = ToolButton12Click OnClick = ToolButton12Click
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 817 Left = 520
Top = 30 Top = 60
AutoSize = True AutoSize = True
Caption = #24322#24120#25968#25454 Caption = #24322#24120#25968#25454
ImageIndex = 2 ImageIndex = 2
OnClick = ToolButton9Click OnClick = ToolButton9Click
end end
object TBExport: TToolButton object TBExport: TToolButton
Left = 904 Left = 607
Top = 30 Top = 60
AutoSize = True AutoSize = True
Caption = #23548#20986 Caption = #23548#20986
ImageIndex = 75 ImageIndex = 75
OnClick = TBExportClick OnClick = TBExportClick
end end
object ToolButton14: TToolButton object ToolButton14: TToolButton
Left = 967 Left = 670
Top = 30 Top = 60
AutoSize = True AutoSize = True
Caption = #36716#21333 Caption = #36716#21333
ImageIndex = 56 ImageIndex = 56
OnClick = ToolButton14Click OnClick = ToolButton14Click
end end
object TBClose: TToolButton object TBClose: TToolButton
Left = 1030 Left = 733
Top = 30 Top = 60
AutoSize = True AutoSize = True
Caption = #20851#38381 Caption = #20851#38381
ImageIndex = 55 ImageIndex = 55
@ -275,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 62 Top = 92
Width = 1384 Width = 1384
Height = 88 Height = 88
Align = alTop Align = alTop
@ -790,9 +791,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
end end
object cxGrid1: TcxGrid object cxGrid1: TcxGrid
Left = 0 Left = 0
Top = 150 Top = 180
Width = 1384 Width = 1384
Height = 568 Height = 538
Align = alClient Align = alClient
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
TabOrder = 3 TabOrder = 3

View File

@ -1641,7 +1641,7 @@ begin
Close; Close;
sql.Clear; sql.Clear;
sql.add('exec P_Do_PrintMd_HZ '); sql.add('exec P_Do_PrintMd_HZ ');
sql.add('@mainID=' + quotedstr(Trim(''))); sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@DName=' + quotedstr(Trim(DCode)));
sql.add(',@flag=''2'' '); sql.add(',@flag=''2'' ');
Open; Open;
@ -1653,7 +1653,7 @@ begin
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.add('exec P_Print_CKMD '); sql.add('exec P_Print_CKMD_MY ');
sql.add('@mainID=' + quotedstr(Trim(''))); sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@DName=' + quotedstr(Trim(DCode)));
Open; Open;

View File

@ -319,16 +319,16 @@ type
procedure Edit12Click(Sender: TObject); procedure Edit12Click(Sender: TObject);
procedure Timer1Timer(Sender: TObject); procedure Timer1Timer(Sender: TObject);
procedure TBCDClick(Sender: TObject); procedure TBCDClick(Sender: TObject);
procedure Edit5Click(Sender: TObject); procedure Edit5Click(Sender: TObject);
private private
{ Private declarations } { Private declarations }
FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer; FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID: string; FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID: string;
FJZ, FJC, FDC: Double; FJZ, FJC, FDC: Double;
fRollType, fRollType1, fbaotype, fbaosx, FPRTdqdw,FDJDW: string; fRollType, fRollType1, fbaotype, fbaosx, FPRTdqdw, FDJDW: string;
isCommopen, IsJsMessage: boolean; isCommopen, IsJsMessage: boolean;
MValue, FCDName, MggCDFalg: string; MValue, FCDName, MggCDFalg: string;
fxsws, fxsws1: string; fxsws, fxsws1: string;
procedure InitJP(); procedure InitJP();
procedure InitCDGrid(); procedure InitCDGrid();
procedure InitCDGridID(); procedure InitCDGridID();
@ -464,17 +464,17 @@ begin
if (trim(Edit7.Text) = '¡Ì') then if (trim(Edit7.Text) = '¡Ì') then
begin begin
MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]); MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
if FPRTdqdw = '·ñ' then // if FPRTdqdw = '·ñ' then
begin // begin
Label9.Caption := FDJDW; // Label9.Caption := FDJDW;
end // end
// else
// begin
if i2 = 0 then
Label9.Caption := 'M'
else else
begin Label9.Caption := 'Y';
if i2 = 0 then // end;
Label9.Caption := 'M'
else
Label9.Caption := 'Y';
end;
edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]); edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
end; end;
@ -899,7 +899,7 @@ end;
function TfrmMJManageNewFDNewSF.SaveData(): Boolean; function TfrmMJManageNewFDNewSF.SaveData(): Boolean;
var var
maxno, FMJID, BZID, strsql, CFMJXH, GMJXH, GMJLen, GMJMaoZ, GMJQty4, Gmjstr4: string; maxno, FMJID, BZID, strsql, CFMJXH, GMJXH, GMJLen, GMJMaoZ, GMJQty4, Gmjstr4: string;
FMJLen: Double; FMJLen, MFMJLen: Double;
FOrder: Integer; FOrder: Integer;
begin begin
@ -1056,7 +1056,19 @@ begin
end end
else else
begin begin
FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc; // FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
if Label9.Caption = 'M' then
begin
FieldByName('MJLen').Value := MFMJLen;
FieldByName('MJMa').Value := format('%.' + trim(fxsws) + 'f', [MFMJLen / 0.9144]);
end
else
begin
FieldByName('MJMa').Value := MFMJLen;
FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [MFMJLen * 0.9144]);
end;
end; end;
FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0);
@ -2470,7 +2482,7 @@ begin
Label2.Visible := true; Label2.Visible := true;
Label2.Caption := '»¨ÐÍ:' + Trim(ADOTmp.fieldbyname('PRTHX').AsString); Label2.Caption := '»¨ÐÍ:' + Trim(ADOTmp.fieldbyname('PRTHX').AsString);
end; end;
FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString); FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString);
FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString); FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString);
FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString); FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString);