From ca7744c3a0c9e592147f1acfbd7ff9ecffa9e64e Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Sun, 4 Jan 2026 14:46:03 +0800
Subject: [PATCH] ~

---
 检验管理/U_JYOrderCDOne.dfm |  8 +++----
 检验管理/U_JYOrderCDOne.pas | 43 +++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 92fc910..448794b 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1392
+    Width = 1384
     Height = 62
     AutoSize = True
     ButtonHeight = 30
@@ -268,7 +268,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object Panel1: TPanel
     Left = 0
     Top = 62
-    Width = 1392
+    Width = 1384
     Height = 88
     Align = alTop
     BevelInner = bvRaised
@@ -783,8 +783,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object cxGrid1: TcxGrid
     Left = 0
     Top = 150
-    Width = 1392
-    Height = 576
+    Width = 1384
+    Height = 568
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index 949c3f6..75dca59 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -12,7 +12,20 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI,
   cxCurrencyEdit, MMSystem, dxSkinsCore, dxSkinsDefaultPainters,
-  dxSkinscxPCPainter;
+  dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
+  dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   TfrmJYOrderCDOne = class(TForm)
@@ -1579,7 +1592,8 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥') or (trim(ComboBox1.Text) = '�����뵥(ë��)') or (trim(ComboBox1.Text) = '�����뵥(ë������)')or (trim(ComboBox1.Text) = '�����뵥(����)')or (trim(ComboBox1.Text) = '�����뵥(��������)')  then
+  if (trim(ComboBox1.Text) = '�����뵥') or (trim(ComboBox1.Text) = '�����뵥(ë��)') or (trim(ComboBox1.Text) = '�����뵥(ë������)')
+  or (trim(ComboBox1.Text) = '�����뵥(����)')or (trim(ComboBox1.Text) = '�����뵥(��������)')  then
   begin
     with ADOQueryTemp do
     begin
@@ -1592,6 +1606,31 @@ 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=''2'' ');                                                             
+      Open;
+    end;
+  end;
+
+  if (trim(ComboBox1.Text) = '�����뵥(����)')  or (trim(ComboBox1.Text) = '�����뵥(������)')   then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL_SL ');      
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
     with ADOQueryPrint do
     begin
       Close;