From 7a447f112f1af8a6c7a6a6a3fc679c0d678750ee Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Tue, 18 Nov 2025 09:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=A0=81=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 检验管理/U_JYOrderCDOne.dfm |  3 ++-
 检验管理/U_JYOrderCDOne.pas | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 9e3a161..78a9126 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -187,7 +187,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333'('#19977#32852#65289
         #26816#39564#30721#21333'('#19977#32852#32454#30721')'
         #26816#39564#30721#21333'('#19977#32852#31859')'
-        #22806#38144#30721#21333'2')
+        #22806#38144#30721#21333'2'
+        #22806#36152#30721#21333)
     end
     object TBAftChkHX: TToolButton
       Left = 596
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index 271d309..8d9272e 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -1557,15 +1557,15 @@ begin
       Open;
     end;
 //    SCreateCDS20(ADOQueryTemp, CDS_PRT);
-//    SInitCDSData20(ADOQueryTemp, CDS_PRT);            
+//    SInitCDSData20(ADOQueryTemp, CDS_PRT);
   end;
-  if (trim(ComboBox1.Text) = '�����뵥2') then        
+  if (trim(ComboBox1.Text) = '��ó�뵥') then                     
   begin
     with ADOQueryTemp do
     begin
       Close;
-      sql.Clear;                                        
-      sql.add('exec P_Print_CKMDHAEILT ');
+      sql.Clear;
+      sql.add('exec P_Print_CKMDHAEIL ');
       sql.add('@mainID=' + quotedstr(Trim('')));
       sql.add(',@DName=' + quotedstr(Trim(DCode)));
       Open;
@@ -1573,6 +1573,32 @@ begin
     SCreateCDS20(ADOQueryTemp, CDS_HZ);
     SInitCDSData20(ADOQueryTemp, CDS_HZ);
 
+    with ADOQueryPrint 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=''22'' ');
+      Open;
+    end;
+
+  end;
+  if (trim(ComboBox1.Text) = '�����뵥2') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDHAEILT ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;                                              
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
     with ADOQueryPrint do
     begin
       Close;