This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-07-18 16:13:33 +08:00
parent 211c02657c
commit 30ac54db4c
4 changed files with 412 additions and 252 deletions

View File

@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1384 Width = 1384
Height = 92 Height = 62
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 119 ButtonWidth = 119
@ -109,28 +109,27 @@ 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 = 0 Left = 671
Top = 30 Top = 0
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 = 111 Left = 782
Top = 30 Top = 0
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 = 222 Left = 893
Top = 30 Top = 0
AutoSize = True AutoSize = True
Caption = #25209#37327#20928#37325#36716#38271#24230 Caption = #25209#37327#20928#37325#36716#38271#24230
ImageIndex = 54 ImageIndex = 54
@ -138,23 +137,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = ToolButton13Click OnClick = ToolButton13Click
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 345 Left = 1016
Top = 30 Top = 0
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 ToolButton15: TToolButton object ToolButton15: TToolButton
Left = 456 Left = 1127
Top = 30 Top = 0
AutoSize = True AutoSize = True
Caption = #20462#25913#31995#25968 Caption = #20462#25913#31995#25968
ImageIndex = 54 ImageIndex = 54
Wrap = True
OnClick = ToolButton15Click OnClick = ToolButton15Click
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 543 Left = 0
Top = 30 Top = 30
AutoSize = True AutoSize = True
Caption = #25171#21360#26631#31614 Caption = #25171#21360#26631#31614
@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = ToolButton1Click OnClick = ToolButton1Click
end end
object TCPDB: TToolButton object TCPDB: TToolButton
Left = 630 Left = 87
Top = 30 Top = 30
AutoSize = True AutoSize = True
Caption = #25104#21697#25171#21253 Caption = #25104#21697#25171#21253
@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = TCPDBClick OnClick = TCPDBClick
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 717 Left = 174
Top = 30 Top = 30
AutoSize = True AutoSize = True
Caption = #25171#21360#21253#26631#31614 Caption = #25171#21360#21253#26631#31614
@ -179,25 +179,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = ToolButton3Click OnClick = ToolButton3Click
end end
object ToolButton2: TToolButton object ToolButton2: TToolButton
Left = 816 Left = 273
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 = 0 Left = 384
Top = 60 Top = 30
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 = 63 Left = 447
Top = 60 Top = 30
Width = 68 Width = 68
Height = 30 Height = 30
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -211,8 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnKeyPress = Edit3KeyPress OnKeyPress = Edit3KeyPress
end end
object ComboBox1: TComboBox object ComboBox1: TComboBox
Left = 131 Left = 515
Top = 63 Top = 33
Width = 149 Width = 149
Height = 24 Height = 24
Style = csDropDownList Style = csDropDownList
@ -236,8 +235,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
#26816#39564#30721#21333) #26816#39564#30721#21333)
end end
object Edit4: TEdit object Edit4: TEdit
Left = 280 Left = 664
Top = 60 Top = 30
Width = 121 Width = 121
Height = 30 Height = 30
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -250,40 +249,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
Visible = False Visible = False
end end
object ToolButton12: TToolButton object ToolButton12: TToolButton
Left = 401 Left = 785
Top = 60 Top = 30
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 = 520 Left = 904
Top = 60 Top = 30
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 = 607 Left = 991
Top = 60 Top = 30
AutoSize = True AutoSize = True
Caption = #23548#20986 Caption = #23548#20986
ImageIndex = 75 ImageIndex = 75
OnClick = TBExportClick OnClick = TBExportClick
end end
object TBClose: TToolButton object TBClose: TToolButton
Left = 670 Left = 1054
Top = 60 Top = 30
AutoSize = True AutoSize = True
Caption = #20851#38381 Caption = #20851#38381
ImageIndex = 55 ImageIndex = 55
OnClick = TBCloseClick OnClick = TBCloseClick
end end
object ToolButton16: TToolButton object ToolButton16: TToolButton
Left = 733 Left = 1117
Top = 60 Top = 30
Caption = #25209#37327#20462#25913 Caption = #25209#37327#20462#25913
ImageIndex = 56 ImageIndex = 56
OnClick = ToolButton16Click OnClick = ToolButton16Click
@ -291,7 +290,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 92 Top = 62
Width = 1384 Width = 1384
Height = 88 Height = 88
Align = alTop Align = alTop
@ -856,9 +855,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
end end
object cxGrid1: TcxGrid object cxGrid1: TcxGrid
Left = 0 Left = 0
Top = 180 Top = 150
Width = 1384 Width = 1384
Height = 538 Height = 568
Align = alClient Align = alClient
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
TabOrder = 3 TabOrder = 3
@ -1182,6 +1181,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
HeaderAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter
Width = 65 Width = 65
end end
object Tv1Column6: TcxGridDBColumn
Caption = #26469#36135#31859#25968
DataBinding.FieldName = 'MJQty1'
HeaderAlignmentHorz = taCenter
Width = 60
end
end end
object cxGrid1Level1: TcxGridLevel object cxGrid1Level1: TcxGridLevel
GridView = Tv1 GridView = Tv1
@ -1411,8 +1416,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
object Panel3: TPanel object Panel3: TPanel
Left = 503 Left = 503
Top = 203 Top = 203
Width = 231 Width = 236
Height = 216 Height = 230
TabOrder = 6 TabOrder = 6
Visible = False Visible = False
object Label19: TLabel object Label19: TLabel
@ -1424,7 +1429,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
object Panel6: TPanel object Panel6: TPanel
Left = 1 Left = 1
Top = 1 Top = 1
Width = 229 Width = 234
Height = 23 Height = 23
Align = alTop Align = alTop
Alignment = taLeftJustify Alignment = taLeftJustify
@ -1490,7 +1495,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
end end
object Button7: TButton object Button7: TButton
Left = 83 Left = 83
Top = 180 Top = 188
Width = 75 Width = 75
Height = 25 Height = 25
Caption = #30830#23450 Caption = #30830#23450
@ -1498,20 +1503,23 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
OnClick = Button7Click OnClick = Button7Click
end end
object RadioGroup2: TRadioGroup object RadioGroup2: TRadioGroup
Left = 56 Left = 32
Top = 24 Top = 24
Width = 129 Width = 177
Height = 145 Height = 153
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
#26816#39564#25253#21578#26222#36890#29256 #26816#39564#25253#21578#26222#36890#29256
#26816#39564#25253#21578#26222#36890#29256'('#22235#20998#21046')'
#26816#39564#25253#21578#26222#36890#29256'('#27454#21495')'
#26816#39564#25253#21578#32568#21495 #26816#39564#25253#21578#32568#21495
#26816#39564#25253#21578#26579#21378#32568#21495) #26816#39564#25253#21578#26579#21378#32568#21495
#26816#39564#25253#21578#25991#23383#29256)
TabOrder = 1 TabOrder = 1
end end
end end
object Panel7: TPanel object Panel7: TPanel
Left = 409 Left = 273
Top = 207 Top = 207
Width = 231 Width = 231
Height = 170 Height = 170
@ -1745,8 +1753,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
end end
end end
object Panel_SMCK: TPanel object Panel_SMCK: TPanel
Left = 412 Left = 236
Top = 180 Top = 188
Width = 317 Width = 317
Height = 97 Height = 97
Color = clSkyBlue Color = clSkyBlue

View File

@ -266,6 +266,7 @@ type
edit_DJ: TComboBox; edit_DJ: TComboBox;
edit_Grade: TComboBox; edit_Grade: TComboBox;
Edit_xs: TcxCurrencyEdit; Edit_xs: TcxCurrencyEdit;
Tv1Column6: TcxGridDBColumn;
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
@ -1400,7 +1401,7 @@ begin
LBName := RadioGroup2.Items.Strings[RadioGroup2.ItemIndex]; LBName := RadioGroup2.Items.Strings[RadioGroup2.ItemIndex];
fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf';
ExportFtErpFile(Trim(LBName) + '.rmf', ADOQueryCmd); ExportFtErpFile(Trim(LBName) + '.rmf', ADOQueryCmd);
with ADOQueryCmd do with ADOQueryCmd do
begin begin
Close; Close;
@ -1454,20 +1455,68 @@ begin
ADOQueryCmd.Connection.RollbackTrans; ADOQueryCmd.Connection.RollbackTrans;
end; end;
Order_Main.EnableControls; Order_Main.EnableControls;
if LBName = '检验报告文字版' then
with ADOQueryCmd do begin
with ADOQueryCmd do
begin
Close;
sql.Clear;
sql.add('exec P_Do_Print_JYBB_WZ ');
sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode)));
sql.add(',@flag=''0'' ');
Open;
end;
SCreateCDS20(ADOQueryCmd, CDS_HZ);
SInitCDSData20(ADOQueryCmd, CDS_HZ);
end
else if LBName = '检验报告普通版(四分制)' then
begin
with ADOQueryCmd do
begin
Close;
sql.Clear;
sql.add('exec P_Do_Print_JYBB_SF ');
sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode)));
sql.add(',@flag=''0'' ');
Open;
end;
SCreateCDS20(ADOQueryCmd, CDS_HZ);
SInitCDSData20(ADOQueryCmd, CDS_HZ);
end
else if LBName = '检验报告普通版(款号)' then
begin
with ADOQueryCmd do
begin
Close;
sql.Clear;
sql.add('exec P_Do_Print_JYBB_KH ');
sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode)));
sql.add(',@flag=''0'' ');
Open;
end;
SCreateCDS20(ADOQueryCmd, CDS_HZ);
SInitCDSData20(ADOQueryCmd, CDS_HZ);
end
else
begin begin
Close;
sql.Clear;
sql.add('exec P_Do_Print_JYBB ');
sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode)));
sql.add(',@flag=''0'' ');
Open;
end;
SCreateCDS20(ADOQueryCmd, CDS_HZ);
SInitCDSData20(ADOQueryCmd, CDS_HZ);
with ADOQueryCmd do
begin
Close;
sql.Clear;
sql.add('exec P_Do_Print_JYBB ');
sql.add('@mainID=' + quotedstr(Trim('')));
sql.add(',@DName=' + quotedstr(Trim(DCode)));
sql.add(',@flag=''0'' ');
Open;
end;
SCreateCDS20(ADOQueryCmd, CDS_HZ);
SInitCDSData20(ADOQueryCmd, CDS_HZ);
end;
with ADOQueryPrint do with ADOQueryPrint do
begin begin
Close; Close;
@ -1507,11 +1556,10 @@ begin
sql.Clear; sql.Clear;
sql.add('exec P_Do_PrintMd_HZ_copy1_copy1 '); sql.add('exec P_Do_PrintMd_HZ_copy1_copy1 ');
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=''5'' '); sql.add(',@flag=''5'' ');
Open; Open;
end; end;
// fPrintFile:= ExtractFilePath(Application.ExeName) + 'Report\¼ìÑ鱨¸æÆÕͨ°æ.rmf'; // fPrintFile:= ExtractFilePath(Application.ExeName) + 'Report\¼ìÑ鱨¸æÆÕͨ°æ.rmf';
if FileExists(fPrintFile) then if FileExists(fPrintFile) then

File diff suppressed because it is too large Load Diff

View File

@ -277,6 +277,10 @@ type
DJ: TComboBox; DJ: TComboBox;
Label61: TLabel; Label61: TLabel;
note: TEdit; note: TEdit;
Label62: TLabel;
Label63: TLabel;
Label64: TLabel;
Label65: TLabel;
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject); procedure TBCloseClick(Sender: TObject);
@ -1631,7 +1635,7 @@ begin
begin begin
if TryStrToFloat(MJQty1.Text, mvalue) = False then if TryStrToFloat(MJQty1.Text, mvalue) = False then
begin begin
Application.MessageBox('Ô­Âë¼Èë´íÎó!', 'Ìáʾ', 0); Application.MessageBox('来货米数录入错误!', '提示', 0);
Exit; Exit;
end; end;
end; end;
@ -1721,6 +1725,24 @@ begin
Label58.Caption := floattostr(syzl); Label58.Caption := floattostr(syzl);
end; end;
with ADOTmp do
begin
Close;
sql.Clear;
sql.Add('select sum(A.mjlen) as GCD,sum(A.MJMaoZ) as Gzl,count(*) as Gps ');
sql.Add(',ZPgj=(select sum(MJMaoZ)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''正品'' ) ');
sql.Add(',CPgj=(select sum(MJMaoZ)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''次品'') ');
sql.Add(',ZPps=(select count(*)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''正品'' ) ');
sql.Add(',CPps=(select count(*)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''次品'') ');
sql.Add(' from WFB_MJJY A where A.Subid=''' + Trim(FSubId) + ''' group by mainid,subid '); //and A.mjstr4=''' + trim(mjstr4.text) + '''
Open;
end;
Label62.Caption := '正品公斤:' + Trim(ADOTmp.fieldbyname('ZPgj').AsString);
Label63.Caption := '次品公斤:' + Trim(ADOTmp.fieldbyname('CPgj').AsString);
Label64.Caption := '正品匹数:' + Trim(ADOTmp.fieldbyname('ZPps').AsString);
Label65.Caption := '次品匹数:' + Trim(ADOTmp.fieldbyname('CPps').AsString);
if edit10.Text = '¡Ì' then if edit10.Text = '¡Ì' then
begin begin
MJXH.Text := inttostr(strTointdef(trim(MJXH.Text), 0) - 1); MJXH.Text := inttostr(strTointdef(trim(MJXH.Text), 0) - 1);
@ -2537,6 +2559,23 @@ begin
Label58.Caption := floattostr(syzl); Label58.Caption := floattostr(syzl);
end; end;
// Label58.Caption := floattostr(syzl); // Label58.Caption := floattostr(syzl);
with ADOQuery2 do
begin
Close;
sql.Clear;
sql.Add('select sum(A.mjlen) as GCD,sum(A.MJMaoZ) as Gzl,count(*) as Gps ');
sql.Add(',ZPgj=(select sum(MJMaoZ)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''正品'' ) ');
sql.Add(',CPgj=(select sum(MJMaoZ)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''次品'') ');
sql.Add(',ZPps=(select count(*)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''正品'' ) ');
sql.Add(',CPps=(select count(*)from WFB_MJJY X where X.mainid=A.mainid and X.subid=A.subid and MJType=''次品'') ');
sql.Add(' from WFB_MJJY A where A.Subid=''' + Trim(APID.Text) + ''' group by mainid,subid ');
Open;
end;
Label62.Caption := '正品公斤:' + Trim(ADOQuery2.fieldbyname('ZPgj').AsString);
Label63.Caption := '次品公斤:' + Trim(ADOQuery2.fieldbyname('CPgj').AsString);
Label64.Caption := '正品匹数:' + Trim(ADOQuery2.fieldbyname('ZPps').AsString);
Label65.Caption := '次品匹数:' + Trim(ADOQuery2.fieldbyname('CPps').AsString);
FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString); FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString);
FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString); FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString);
@ -2781,6 +2820,22 @@ begin
end; end;
end; end;
end; end;
with ADOTmp do
begin
Close;
sql.Clear;
sql.Add('select sum(A.mjlen) as GCD,sum(A.MJMaoZ) as Gzl,count(*) as Gps ');
// sql.Add(',ZPps=(select count(*)from WFB_MJJY X where X.mainid=A.mainid and MJType=''正品'' ) ');
// sql.Add(',CPps=(select count(*)from WFB_MJJY X where X.mainid=A.mainid and MJType=''次品'') ');
sql.Add(' from WFB_MJJY A where A.Subid=''' + Trim(FSubId) + ''' and A.mjstr4=''' + trim(mjstr4.text) + ''' ');
Open;
end;
// Label62.Caption := '匹数/缸:' + Trim(ADOTmp.fieldbyname('Gps').AsString);
// Label63.Caption := '公斤/缸:' + Trim(ADOTmp.fieldbyname('Gzl').AsString);
// Label64.Caption := '正品匹数:' + Trim(ADOTmp.fieldbyname('ZPps').AsString);
// Label65.Caption := '次品匹数:' + Trim(ADOTmp.fieldbyname('CPps').AsString);
end; end;
procedure TfrmMJManageNewFDNewSF.ToolButton2Click(Sender: TObject); procedure TfrmMJManageNewFDNewSF.ToolButton2Click(Sender: TObject);