From 141ed6d274df5712f8eb806fa9878b1a298656fb Mon Sep 17 00:00:00 2001
From: libingpeng <3360871605@qq.com>
Date: Tue, 9 Dec 2025 13:14:09 +0800
Subject: [PATCH] 1

---
 检验管理/U_JYOrderCDOne.dfm | 17 ++++++++---------
 检验管理/U_JYOrderCDOne.pas | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 8cd9a40..fcb7ba4 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -1,7 +1,7 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
   Left = 206
   Top = 161
-  Width = 1656
+  Width = 1556
   Height = 791
   Caption = #26816#39564#25253#21578
   Color = clBtnFace
@@ -20,7 +20,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1648
+    Width = 1548
     Height = 62
     AutoSize = True
     ButtonHeight = 30
@@ -185,10 +185,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Font.Name = #23435#20307
       Font.Style = []
       ItemHeight = 16
-      ItemIndex = 0
       ParentFont = False
       TabOrder = 0
-      Text = #26816#39564#30721#21333'('#26222#36890#33521#25991#31859#36716#30721')'
       Items.Strings = (
         #26816#39564#30721#21333'('#26222#36890#33521#25991#31859#36716#30721')'
         #26816#39564#30721#21333'('#33521#25991#30721#36716#31859')'
@@ -207,7 +205,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333'('#30917')'
         #26816#39564#30721#21333'('#26465#30721')'
         #25391#22686#26465#30721
-        #28151#33394#21253#35013'-10'#33394)
+        #28151#33394#21253#35013'-10'#33394
+        #24040#21513#27719#24635)
     end
     object TBAftChkHX: TToolButton
       Left = 634
@@ -238,7 +237,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object Panel1: TPanel
     Left = 0
     Top = 62
-    Width = 1648
+    Width = 1548
     Height = 88
     Align = alTop
     BevelInner = bvRaised
@@ -732,7 +731,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object cxGrid1: TcxGrid
     Left = 0
     Top = 182
-    Width = 1648
+    Width = 1548
     Height = 578
     Align = alClient
     PopupMenu = PopupMenu1
@@ -1603,12 +1602,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object Panel11: TPanel
     Left = 0
     Top = 150
-    Width = 1648
+    Width = 1548
     Height = 32
     Align = alTop
     TabOrder = 10
     DesignSize = (
-      1648
+      1548
       32)
     object LBCPAP: TLabel
       Left = 643
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index 6f92007..0f428dc 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -1709,6 +1709,20 @@ begin
     end;
     SCreateCDS20(ADOQueryTemp, CDS_PRT);
     SInitCDSData20(ADOQueryTemp, CDS_PRT);
+
+  end;
+
+  if (trim(ComboBox1.Text) = '�޼�����')  then
+  begin
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ_1 ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
   end;
 
   if FileExists(fPrintFile) then