~

2025-07-18 16:13:33 +08:00 · 2025-07-18 16:13:33 +08:00 · 30ac54db4c
commit 30ac54db4c
parent 211c02657c
4 changed files with 412 additions and 252 deletions
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    Left = 0
    Top = 0
    Width = 1384
-    Height = 92
+    Height = 62
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 119
@ -109,28 +109,27 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Top = 0
      Caption = #25209#37327#20462#25913#32568#21495
      ImageIndex = 54
-      Wrap = True
      OnClick = ToolButton11Click
    end
    object TBDW: TToolButton
-      Left = 0
-      Top = 30
+      Left = 671
+      Top = 0
      AutoSize = True
      Caption = #20462#25913#25968#37327#21333#20301
      ImageIndex = 54
      OnClick = TBDWClick
    end
    object ToolButton4: TToolButton
-      Left = 111
-      Top = 30
+      Left = 782
+      Top = 0
      AutoSize = True
      Caption = #25209#37327#35843#25972#31859#25968
      ImageIndex = 54
      OnClick = ToolButton4Click
    end
    object ToolButton13: TToolButton
-      Left = 222
-      Top = 30
+      Left = 893
+      Top = 0
      AutoSize = True
      Caption = #25209#37327#20928#37325#36716#38271#24230
      ImageIndex = 54
@ -138,23 +137,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton13Click
    end
    object ToolButton8: TToolButton
-      Left = 345
-      Top = 30
+      Left = 1016
+      Top = 0
      AutoSize = True
      Caption = #25209#37327#20462#25913#30382#37325
      ImageIndex = 54
      OnClick = ToolButton8Click
    end
    object ToolButton15: TToolButton
-      Left = 456
-      Top = 30
+      Left = 1127
+      Top = 0
      AutoSize = True
      Caption = #20462#25913#31995#25968
      ImageIndex = 54
+      Wrap = True
      OnClick = ToolButton15Click
    end
    object ToolButton1: TToolButton
-      Left = 543
+      Left = 0
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26631#31614
@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton1Click
    end
    object TCPDB: TToolButton
-      Left = 630
+      Left = 87
      Top = 30
      AutoSize = True
      Caption = #25104#21697#25171#21253
@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = TCPDBClick
    end
    object ToolButton3: TToolButton
-      Left = 717
+      Left = 174
      Top = 30
      AutoSize = True
      Caption = #25171#21360#21253#26631#31614
@ -179,25 +179,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = ToolButton3Click
    end
    object ToolButton2: TToolButton
-      Left = 816
+      Left = 273
      Top = 30
      AutoSize = True
      Caption = #25171#21360#26816#39564#25253#21578
      ImageIndex = 12
-      Wrap = True
      OnClick = ToolButton2Click
    end
    object ToolButton5: TToolButton
-      Left = 0
-      Top = 60
+      Left = 384
+      Top = 30
      AutoSize = True
      Caption = #25171#21360
      ImageIndex = 12
      OnClick = ToolButton5Click
    end
    object Edit3: TEdit
-      Left = 63
-      Top = 60
+      Left = 447
+      Top = 30
      Width = 68
      Height = 30
      Font.Charset = GB2312_CHARSET
@ -211,8 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnKeyPress = Edit3KeyPress
    end
    object ComboBox1: TComboBox
-      Left = 131
-      Top = 63
+      Left = 515
+      Top = 33
      Width = 149
      Height = 24
      Style = csDropDownList
@ -236,8 +235,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
        #26816#39564#30721#21333)
    end
    object Edit4: TEdit
-      Left = 280
-      Top = 60
+      Left = 664
+      Top = 30
      Width = 121
      Height = 30
      Font.Charset = GB2312_CHARSET
@ -250,40 +249,40 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      Visible = False
    end
    object ToolButton12: TToolButton
-      Left = 401
-      Top = 60
+      Left = 785
+      Top = 30
      Caption = #20462#25913#30721#21333
      ImageIndex = 54
      Visible = False
      OnClick = ToolButton12Click
    end
    object ToolButton9: TToolButton
-      Left = 520
-      Top = 60
+      Left = 904
+      Top = 30
      AutoSize = True
      Caption = #24322#24120#25968#25454
      ImageIndex = 2
      OnClick = ToolButton9Click
    end
    object TBExport: TToolButton
-      Left = 607
-      Top = 60
+      Left = 991
+      Top = 30
      AutoSize = True
      Caption = #23548#20986
      ImageIndex = 75
      OnClick = TBExportClick
    end
    object TBClose: TToolButton
-      Left = 670
-      Top = 60
+      Left = 1054
+      Top = 30
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 55
      OnClick = TBCloseClick
    end
    object ToolButton16: TToolButton
-      Left = 733
-      Top = 60
+      Left = 1117
+      Top = 30
      Caption = #25209#37327#20462#25913
      ImageIndex = 56
      OnClick = ToolButton16Click
@ -291,7 +290,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  end
  object Panel1: TPanel
    Left = 0
-    Top = 92
+    Top = 62
    Width = 1384
    Height = 88
    Align = alTop
@ -856,9 +855,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  end
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 180
+    Top = 150
    Width = 1384
-    Height = 538
+    Height = 568
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 3
@ -1182,6 +1181,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
        HeaderAlignmentHorz = taCenter
        Width = 65
      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #26469#36135#31859#25968
+        DataBinding.FieldName = 'MJQty1'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
    end
    object cxGrid1Level1: TcxGridLevel
      GridView = Tv1
@ -1411,8 +1416,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
  object Panel3: TPanel
    Left = 503
    Top = 203
-    Width = 231
-    Height = 216
+    Width = 236
+    Height = 230
    TabOrder = 6
    Visible = False
    object Label19: TLabel
@ -1424,7 +1429,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    object Panel6: TPanel
      Left = 1
      Top = 1
-      Width = 229
+      Width = 234
      Height = 23
      Align = alTop
      Alignment = taLeftJustify
@ -1490,7 +1495,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    end
    object Button7: TButton
      Left = 83
-      Top = 180
+      Top = 188
      Width = 75
      Height = 25
      Caption = #30830#23450
@ -1498,20 +1503,23 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
      OnClick = Button7Click
    end
    object RadioGroup2: TRadioGroup
-      Left = 56
+      Left = 32
      Top = 24
-      Width = 129
-      Height = 145
+      Width = 177
+      Height = 153
      ItemIndex = 0
      Items.Strings = (
        #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#26579#21378#32568#21495)
+        #26816#39564#25253#21578#26579#21378#32568#21495
+        #26816#39564#25253#21578#25991#23383#29256)
      TabOrder = 1
    end
  end
  object Panel7: TPanel
-    Left = 409
+    Left = 273
    Top = 207
    Width = 231
    Height = 170
@ -1745,8 +1753,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    end
  end
  object Panel_SMCK: TPanel
-    Left = 412
-    Top = 180
+    Left = 236
+    Top = 188
    Width = 317
    Height = 97
    Color = clSkyBlue
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@ -266,6 +266,7 @@ type
    edit_DJ: TComboBox;
    edit_Grade: TComboBox;
    Edit_xs: TcxCurrencyEdit;
+    Tv1Column6: TcxGridDBColumn;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -1400,7 +1401,7 @@ begin
  LBName := RadioGroup2.Items.Strings[RadioGroup2.ItemIndex];
  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf';
  ExportFtErpFile(Trim(LBName) + '.rmf', ADOQueryCmd);
-                                  
+
  with ADOQueryCmd do
  begin
    Close;
@ -1454,20 +1455,68 @@ begin
    ADOQueryCmd.Connection.RollbackTrans;
  end;
  Order_Main.EnableControls;
-
-  with ADOQueryCmd do
+  if LBName = '检验报告文字版' then
+  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
-    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
  begin
    Close;
@ -1507,11 +1556,10 @@ begin
    sql.Clear;
    sql.add('exec P_Do_PrintMd_HZ_copy1_copy1 ');
    sql.add('@mainID=' + quotedstr(Trim('')));
-    sql.add(',@DName=' + quotedstr(Trim(DCode)));           
+    sql.add(',@DName=' + quotedstr(Trim(DCode)));
    sql.add(',@flag=''5'' ');
-    Open;                                                             
-  end;                              
-
+    Open;
+  end;

 //    fPrintFile:= ExtractFilePath(Application.ExeName) + 'Report\¼ìÑé±¨¸æÆÕÍ¨°æ.rmf';
  if FileExists(fPrintFile) then
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@ -277,6 +277,10 @@ type
    DJ: TComboBox;
    Label61: TLabel;
    note: TEdit;
+    Label62: TLabel;
+    Label63: TLabel;
+    Label64: TLabel;
+    Label65: TLabel;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -1631,7 +1635,7 @@ begin
  begin
    if TryStrToFloat(MJQty1.Text, mvalue) = False then
    begin
-      Application.MessageBox('ÔÂëÂ¼Èë´íÎó!', 'ÌáÊ¾', 0);
+      Application.MessageBox('来货米数录入错误!', '提示', 0);
      Exit;
    end;
  end;
@ -1721,6 +1725,24 @@ begin
      Label58.Caption := floattostr(syzl);
    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
    begin
      MJXH.Text := inttostr(strTointdef(trim(MJXH.Text), 0) - 1);
@ -2537,6 +2559,23 @@ begin
      Label58.Caption := floattostr(syzl);
    end;
 //    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);
    FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString);
@ -2781,6 +2820,22 @@ begin
      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;

 procedure TfrmMJManageNewFDNewSF.ToolButton2Click(Sender: TObject);