From d8cd5d0318e7d21c95029bbd66bf2c993a7e37d5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Sat, 19 Jul 2025 10:19:11 +0800
Subject: [PATCH] ~

---
 检验管理/U_CKProductBCPOutList.dfm |  3 ++-
 检验管理/U_CKProductBCPOutList.pas | 29 ++++++++++++++++++++++++++++-
 检验管理/U_CpCkSaoMNewSel.pas      |  4 ++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/检验管理/U_CKProductBCPOutList.dfm b/检验管理/U_CKProductBCPOutList.dfm
index ab84715..30255af 100644
--- a/检验管理/U_CKProductBCPOutList.dfm
+++ b/检验管理/U_CKProductBCPOutList.dfm
@@ -96,7 +96,8 @@ object frmCKProductBCPOutList: TfrmCKProductBCPOutList
       Text = #38144#21806#30721#21333
       Items.Strings = (
         #38144#21806#30721#21333
-        #20986#24211#30721#21333)
+        #20986#24211#30721#21333
+        #26126#32454#30721#21333)
     end
     object TBClose: TToolButton
       Left = 475
diff --git a/检验管理/U_CKProductBCPOutList.pas b/检验管理/U_CKProductBCPOutList.pas
index 4581240..1e3199f 100644
--- a/检验管理/U_CKProductBCPOutList.pas
+++ b/检验管理/U_CKProductBCPOutList.pas
@@ -385,6 +385,32 @@ begin
     SCreateCDS20(ADOQueryTemp, CDS_HZ);
     SInitCDSData20(ADOQueryTemp, CDS_HZ);
 
+    with ADOQueryTemp do
+    begin                                                          
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_PRT);
+    SInitCDSData20(ADOQueryTemp, CDS_PRT);
+  end;
+  if trim(ComboBox1.Text) = '��ϸ�뵥' then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL ');
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
     with ADOQueryTemp do
     begin
       Close;
@@ -398,6 +424,7 @@ begin
     SCreateCDS20(ADOQueryTemp, CDS_PRT);
     SInitCDSData20(ADOQueryTemp, CDS_PRT);
   end;
+
   if (trim(ComboBox1.Text) = '�����뵥') or (trim(combobox1.Text) = '�����뵥-����') then
   begin
     with ADOQueryTemp do
@@ -1304,7 +1331,7 @@ begin
     CDS_Main.EnableControls;
     ADOQueryCmd.Connection.CommitTrans;
     MovePanel2.Visible := False;
-    Exit;                                                      
+    Exit;
   except
     MovePanel2.Visible := False;
     CDS_Main.EnableControls;
diff --git a/检验管理/U_CpCkSaoMNewSel.pas b/检验管理/U_CpCkSaoMNewSel.pas
index d1a2928..4c485cb 100644
--- a/检验管理/U_CpCkSaoMNewSel.pas
+++ b/检验管理/U_CpCkSaoMNewSel.pas
@@ -631,7 +631,7 @@ procedure TfrmCpCkSaoMNewSel.Button5Click(Sender: TObject);
 var
   maxno, sqlstr: string;
   CRID, i, SJ: Integer;
-  MaxCkNo, MaxCkSubNo: string;
+  MaxCkNo, MaxCkSubNo: string;                          
 begin
 
   if GetLSNo(ADOQueryCmd, maxno, 'CC', 'CK_BanCp_CR', 4, 1) = False then
@@ -710,7 +710,7 @@ begin
           FieldByName('SOrddefstr1').Value := Self.CDS_Main.fieldbyname('SOrddefstr1').Value;
           FieldByName('MJXH').Value := Self.CDS_Main.fieldbyname('MJXH').Value;
           FieldByName('AOrdDefstr1').Value := CDS_Main.fieldbyname('AOrdDefstr1').Value;
-          FieldByName('MJStr4').Value := CDS_Main.fieldbyname('MJStr4').Value;
+//          FieldByName('MJStr4').Value := Trim(CDS_Main.fieldbyname('MJStr4').AsString);
           FieldByName('KHName').Value := CDS_Main.fieldbyname('KHName').Value;
           FieldByName('RKOrdId').Value := CDS_Main.fieldbyname('RKOrdId').Value;
           FieldByName('BaoNo').Value := CDS_Main.fieldbyname('BaoNo').Value;