diff --git a/云翔生产管理(MYSC.dll)/U_ZHCPDJList.dfm b/云翔生产管理(MYSC.dll)/U_ZHCPDJList.dfm
index 570859e..50ba222 100644
--- a/云翔生产管理(MYSC.dll)/U_ZHCPDJList.dfm
+++ b/云翔生产管理(MYSC.dll)/U_ZHCPDJList.dfm
@@ -1,6 +1,6 @@
 object frmZHCPDJList: TfrmZHCPDJList
-  Left = 85
-  Top = 115
+  Left = 282
+  Top = 162
   Width = 1252
   Height = 637
   Caption = #25253#20215#30331#35760
@@ -20,7 +20,7 @@ object frmZHCPDJList: TfrmZHCPDJList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1236
+    Width = 1244
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 65
@@ -92,8 +92,8 @@ object frmZHCPDJList: TfrmZHCPDJList
   object cxGrid1: TcxGrid
     Left = 0
     Top = 72
-    Width = 1236
-    Height = 526
+    Width = 1244
+    Height = 534
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 1
@@ -275,7 +275,7 @@ object frmZHCPDJList: TfrmZHCPDJList
   object Panel11: TPanel
     Left = 0
     Top = 32
-    Width = 1236
+    Width = 1244
     Height = 40
     Align = alTop
     BevelInner = bvRaised
@@ -352,7 +352,7 @@ object frmZHCPDJList: TfrmZHCPDJList
     object Panel1: TPanel
       Left = 354
       Top = 2
-      Width = 880
+      Width = 888
       Height = 36
       Align = alClient
       BevelInner = bvRaised
diff --git a/云翔生产管理(MYSC.dll)/U_ZHDJInPut.dfm b/云翔生产管理(MYSC.dll)/U_ZHDJInPut.dfm
index bad86ea..ba344d2 100644
--- a/云翔生产管理(MYSC.dll)/U_ZHDJInPut.dfm
+++ b/云翔生产管理(MYSC.dll)/U_ZHDJInPut.dfm
@@ -1,6 +1,6 @@
 object frmZHDJInPut: TfrmZHDJInPut
-  Left = 306
-  Top = 70
+  Left = 495
+  Top = 255
   Width = 1344
   Height = 697
   Caption = #20135#21697#30331#35760
diff --git a/云翔生产管理(MYSC.dll)/U_ZHDJInPut.pas b/云翔生产管理(MYSC.dll)/U_ZHDJInPut.pas
index c6d937f..52551ca 100644
--- a/云翔生产管理(MYSC.dll)/U_ZHDJInPut.pas
+++ b/云翔生产管理(MYSC.dll)/U_ZHDJInPut.pas
@@ -207,7 +207,7 @@ begin
     sql.Add(' from ZH_KH_DJ_CP A  ');
     sql.Add(' left join ZH_CP_Info B on A.ZIID=B.ZIID ');
     sql.Add(' left join ZH_CP_Info C on B.ZIIDYS=C.ZIID ');
-    sql.Add(' where A.ZDID=''' + Trim(FMainId) + ''' and A.Valid=''Y'' ');
+    sql.Add(' where isnull(A.ZDID,'''')<>'''' and A.ZDID=''' + Trim(FMainId) + ''' and A.Valid=''Y'' ');
     Open;
   end;
   SCreateCDS20(ADOTemp, Order_Sub);
diff --git a/生产计划单(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof b/生产计划单(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof
index f3698c4..aa0f4d5 100644
--- a/生产计划单(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof
+++ b/生产计划单(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�����ֿ�������\��Ŀ����\����\�����ƻ���(DyeingFinishingPlan.dll)\testDll.exe
+HostApplication=D:\�����ֿ�������\��Ŀ����\D7WMyunxiang\�����ƻ���(DyeingFinishingPlan.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.dfm b/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.dfm
index 5f60588..361c115 100644
--- a/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.dfm
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.dfm
@@ -29,7 +29,7 @@ object frmMJJYTH: TfrmMJJYTH
     Left = 0
     Top = 0
     Width = 207
-    Height = 845
+    Height = 853
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -342,8 +342,8 @@ object frmMJJYTH: TfrmMJJYTH
   object PageControl1: TPageControl
     Left = 207
     Top = 0
-    Width = 1021
-    Height = 845
+    Width = 1029
+    Height = 853
     ActivePage = TabSheet3
     Align = alClient
     Style = tsFlatButtons
@@ -355,7 +355,7 @@ object frmMJJYTH: TfrmMJJYTH
         Left = 0
         Top = 0
         Width = 514
-        Height = 815
+        Height = 823
         Align = alLeft
         BevelInner = bvRaised
         BevelOuter = bvLowered
@@ -1733,6 +1733,22 @@ object frmMJJYTH: TfrmMJJYTH
           OnClick = JYLenClick
           OnKeyPress = MJstr3KeyPress
         end
+        object JYGH: TEdit
+          Left = 390
+          Top = 149
+          Width = 91
+          Height = 41
+          Font.Charset = ANSI_CHARSET
+          Font.Color = clRed
+          Font.Height = -32
+          Font.Name = #23435#20307
+          Font.Style = [fsBold]
+          ParentFont = False
+          TabOrder = 11
+          OnChange = JYKGChange
+          OnClick = JYLenClick
+          OnKeyPress = MJstr3KeyPress
+        end
       end
       object Panel4: TPanel
         Left = -8
diff --git a/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.pas b/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.pas
index 3e08cfb..2cc7b24 100644
--- a/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.pas
+++ b/生产计划单(DyeingFinishingPlan.dll)/U_MJJYTH.pas
@@ -347,6 +347,7 @@ type
     JYMF: TEdit;
     Label41: TLabel;
     JYKZ: TEdit;
+    JYGH: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
@@ -2840,6 +2841,7 @@ begin
     sql.Add(',JYJZ=isnull(''' + JYJZ.Text+''','''')');
     sql.Add(',JYMF=isnull(''' + JYMF.Text+''','''')');
     sql.Add(',JYKZ=isnull(''' + JYKZ.Text+''','''')');
+    sql.Add(',JYGH=isnull(''' + JYGH.Text+''','''')');
 //    ShowMessage(sql.text);
     Open;
   end;