From 7622a7414f9d1d984df8a05ad14ba171f928632c Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Mon, 8 Dec 2025 10:34:07 +0800
Subject: [PATCH] ~

---
 .../U_JYOrderCDList.dfm                       | 46 +++++++++----------
 .../U_JYOrderCDList.pas                       |  4 +-
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm
index e0909f8..f6c6a5d 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm
+++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm
@@ -19,8 +19,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1349
-    Height = 62
+    Width = 1341
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 143
@@ -88,45 +87,44 @@ object frmJYOrderCDList: TfrmJYOrderCDList
       AutoSize = True
       Caption = #25171#21360#21367#26631#31614
       ImageIndex = 4
-      Wrap = True
       Visible = False
       OnClick = ToolButton1Click
     end
     object ToolButton8: TToolButton
-      Left = 0
-      Top = 30
+      Left = 510
+      Top = 0
       AutoSize = True
       Caption = #20837#24211#24182#25171#21360#20179#24211#30721#21333
       ImageIndex = 12
       OnClick = ToolButton8Click
     end
     object ToolButton4: TToolButton
-      Left = 147
-      Top = 30
+      Left = 657
+      Top = 0
       AutoSize = True
       Caption = #37325#25171#20179#24211#30721#21333
       ImageIndex = 4
       OnClick = ToolButton4Click
     end
     object B1: TToolButton
-      Left = 258
-      Top = 30
+      Left = 768
+      Top = 0
       AutoSize = True
       Caption = #25171#30721#26085#24535
       ImageIndex = 22
       OnClick = B1Click
     end
     object TBExport: TToolButton
-      Left = 345
-      Top = 30
+      Left = 855
+      Top = 0
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 68
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 408
-      Top = 30
+      Left = 918
+      Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 21
@@ -135,8 +133,8 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
-    Width = 1349
+    Top = 32
+    Width = 1341
     Height = 81
     Align = alTop
     BevelInner = bvRaised
@@ -585,9 +583,9 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 196
-    Width = 1349
-    Height = 494
+    Top = 166
+    Width = 1341
+    Height = 516
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 4
@@ -1083,15 +1081,15 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   end
   object Panel6: TPanel
     Left = 0
-    Top = 143
-    Width = 1349
+    Top = 113
+    Width = 1341
     Height = 28
     Align = alTop
     AutoSize = True
     BorderStyle = bsSingle
     TabOrder = 2
     DesignSize = (
-      1345
+      1337
       24)
     object Label31: TLabel
       Left = 25
@@ -1184,8 +1182,8 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   end
   object cxTabControl1: TcxTabControl
     Left = 0
-    Top = 171
-    Width = 1349
+    Top = 141
+    Width = 1341
     Height = 25
     Align = alTop
     Font.Charset = GB2312_CHARSET
@@ -1204,7 +1202,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 27
-    ClientRectRight = 1349
+    ClientRectRight = 1341
     ClientRectTop = 27
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas
index b4cd58f..972a416 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas
@@ -293,11 +293,11 @@ begin
   with Order_Main do
   begin
 
-    with ADOQueryPrint do
+    with ADOQueryPrint do                 
     begin
       Close;
       SQL.Clear;
-      sql.Add(' exec P_Print_RKMDGangNo ');
+      sql.Add(' exec P_Print_RKMDGangNo_W ');
       SQL.Add(' @RKOrdID=''' + Trim(MRKOrdID) + '''');
       Open;
     end;