diff --git a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm
index 7b9cea4..dc240e4 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm
+++ b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.dfm
@@ -1,6 +1,6 @@
 object frmOrderInPut: TfrmOrderInPut
-  Left = 611
-  Top = 221
+  Left = 293
+  Top = 225
   Width = 1117
   Height = 743
   Caption = #25351#31034#21333#24405#20837
@@ -18,7 +18,7 @@ object frmOrderInPut: TfrmOrderInPut
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1109
+    Width = 1101
     Height = 29
     ButtonHeight = 30
     ButtonWidth = 59
@@ -58,7 +58,7 @@ object frmOrderInPut: TfrmOrderInPut
   object ScrollBox1: TScrollBox
     Left = 0
     Top = 29
-    Width = 1109
+    Width = 1101
     Height = 316
     Align = alTop
     BevelInner = bvNone
@@ -200,7 +200,7 @@ object frmOrderInPut: TfrmOrderInPut
     end
     object Label26: TLabel
       Left = 415
-      Top = 74
+      Top = 72
       Width = 65
       Height = 12
       Caption = #24067#31181#32534#21495#65306
@@ -380,6 +380,19 @@ object frmOrderInPut: TfrmOrderInPut
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label22: TLabel
+      Left = 578
+      Top = 72
+      Width = 65
+      Height = 12
+      Caption = #26631#31614#23458#25143#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrderNo: TEdit
       Tag = 1
       Left = 97
@@ -555,7 +568,7 @@ object frmOrderInPut: TfrmOrderInPut
     object MPRTCode: TEdit
       Tag = 1
       Left = 474
-      Top = 71
+      Top = 69
       Width = 100
       Height = 18
       TabOrder = 17
@@ -614,19 +627,27 @@ object frmOrderInPut: TfrmOrderInPut
       TabOrder = 23
       OnChange = PRTColorChange
     end
+    object LBCustName: TEdit
+      Tag = 1
+      Left = 646
+      Top = 69
+      Width = 100
+      Height = 18
+      TabOrder = 24
+    end
   end
   object cxPageControl1: TcxPageControl
     Left = 0
     Top = 345
-    Width = 1109
-    Height = 367
+    Width = 1101
+    Height = 359
     Align = alClient
     TabOrder = 2
     Properties.ActivePage = cxTabSheet4
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 8
-    ClientRectBottom = 367
-    ClientRectRight = 1109
+    ClientRectBottom = 359
+    ClientRectRight = 1101
     ClientRectTop = 23
     object cxTabSheet3: TcxTabSheet
       Caption = #24037#24207#23450#20041
@@ -635,7 +656,6 @@ object frmOrderInPut: TfrmOrderInPut
         Left = 0
         Top = 0
         Width = 1101
-        Height = 29
         AutoSize = True
         ButtonHeight = 30
         ButtonWidth = 107
@@ -689,7 +709,7 @@ object frmOrderInPut: TfrmOrderInPut
         Left = 0
         Top = 32
         Width = 1101
-        Height = 308
+        Height = 304
         Align = alClient
         TabOrder = 1
         object TV2: TcxGridDBTableView
@@ -735,7 +755,7 @@ object frmOrderInPut: TfrmOrderInPut
       object ToolBar2: TToolBar
         Left = 0
         Top = 0
-        Width = 1109
+        Width = 1101
         AutoSize = True
         ButtonHeight = 30
         ButtonWidth = 83
@@ -764,8 +784,8 @@ object frmOrderInPut: TfrmOrderInPut
       object cxGrid1: TcxGrid
         Left = 0
         Top = 32
-        Width = 1109
-        Height = 312
+        Width = 1101
+        Height = 304
         Align = alClient
         TabOrder = 1
         object TV1: TcxGridDBTableView
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas
index 5aa7517..b9e0046 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas
@@ -119,6 +119,8 @@ type
     MPRTCF: TEdit;
     Label21: TLabel;
     PRTKuanNO: TEdit;
+    Label22: TLabel;
+    LBCustName: TEdit;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -635,6 +637,7 @@ begin
       if ShowModal = 1 then
       begin
         CustomerNoName.Text := Trim(CDS_HZ.fieldbyname('CoName').AsString);
+        LBCustName.Text := Trim(CDS_HZ.fieldbyname('CoHRName').AsString);
         CustomerNoName.TxtCode := Trim(CDS_HZ.fieldbyname('CoCode').AsString);
         YWY.Text := Trim(CDS_HZ.fieldbyname('Salesman').AsString);
       end;
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_PBKcList.pas b/染整计划(DyeingFinishingPlan.dll)/U_PBKcList.pas
index 3fd12a0..404b0d6 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_PBKcList.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_PBKcList.pas
@@ -10,7 +10,21 @@ uses
   cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
   cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox,
   RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, MMSystem, Menus,
-  BtnEdit, RM_e_Xls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator;
+  BtnEdit, RM_e_Xls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
+  dxSkinsCore, 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, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmPBKcList = class(TForm)
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.dfm b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.dfm
index 2303a3b..ee48395 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.dfm
+++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.dfm
@@ -21,6 +21,7 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
     Left = 0
     Top = 0
     Width = 1272
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -85,12 +86,13 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
       AutoSize = True
       Caption = #21253#26631#31614#35774#32622
       ImageIndex = 15
+      Wrap = True
       Visible = False
       OnClick = ToolButton4Click
     end
     object ToolButton7: TToolButton
-      Left = 510
-      Top = 0
+      Left = 0
+      Top = 30
       AutoSize = True
       Caption = #21253#26631#31614#27979#35797#39044#35272
       ImageIndex = 14
@@ -98,24 +100,24 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
       OnClick = ToolButton7Click
     end
     object ToolButton3: TToolButton
-      Left = 633
-      Top = 0
+      Left = 123
+      Top = 30
       AutoSize = True
       Caption = #30382#37325#35774#32622'(Kg)'
       ImageIndex = 11
       OnClick = ToolButton3Click
     end
     object ToolButton5: TToolButton
-      Left = 744
-      Top = 0
+      Left = 234
+      Top = 30
       AutoSize = True
       Caption = #31995#25968#35774#32622
       ImageIndex = 11
       OnClick = ToolButton5Click
     end
     object PiZhong: TEdit
-      Left = 831
-      Top = 0
+      Left = 321
+      Top = 30
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -127,8 +129,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
       TabOrder = 0
     end
     object TBClose: TToolButton
-      Left = 952
-      Top = 0
+      Left = 442
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 21
@@ -137,7 +139,7 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
   end
   object Panel1: TPanel
     Left = 0
-    Top = 32
+    Top = 62
     Width = 1272
     Height = 67
     Align = alTop
@@ -358,13 +360,13 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 99
+    Top = 129
     Width = 1272
-    Height = 463
+    Height = 432
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -508,8 +510,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
         Caption = #25442#31639#31995#25968
         DataBinding.FieldName = 'Xs'
         HeaderAlignmentHorz = taCenter
-        Hidden = True
         Options.Editing = False
+        VisibleForCustomization = False
         Width = 75
       end
       object v1Column6: TcxGridDBColumn
@@ -526,8 +528,8 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet
         Properties.OnEditValueChanged = v1Column6PropertiesEditValueChanged
         Visible = False
         HeaderAlignmentHorz = taCenter
-        Hidden = True
         Options.Editing = False
+        VisibleForCustomization = False
         Width = 109
       end
       object v1Column8: TcxGridDBColumn
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.pas b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.pas
index cf0f87d..431808e 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderLBNameSet.pas
@@ -10,7 +10,22 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, StrUtils, Menus, cxTextEdit,
-  cxDropDownEdit;
+  cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
+  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, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  cxNavigator;
 
 type
   TfrmProductOrderLBNameSet = class(TForm)
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm
index 10c5803..770ddbe 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm
+++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.dfm
@@ -1,6 +1,6 @@
 object frmProductOrderList: TfrmProductOrderList
-  Left = 288
-  Top = 72
+  Left = 226
+  Top = 163
   Width = 1256
   Height = 754
   Caption = #29983#20135#25351#31034#21333
@@ -19,7 +19,7 @@ object frmProductOrderList: TfrmProductOrderList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1248
+    Width = 1240
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 95
@@ -162,16 +162,16 @@ object frmProductOrderList: TfrmProductOrderList
   object cxPageControl1: TcxPageControl
     Left = 0
     Top = 162
-    Width = 1248
-    Height = 561
+    Width = 1240
+    Height = 553
     Align = alClient
     TabOrder = 1
     Properties.ActivePage = cxTabSheet4
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 8
     OnChange = cxPageControl1Change
-    ClientRectBottom = 561
-    ClientRectRight = 1248
+    ClientRectBottom = 553
+    ClientRectRight = 1240
     ClientRectTop = 23
     object cxTabSheet3: TcxTabSheet
       Caption = #22383#24067#24211#21015#34920
@@ -198,7 +198,7 @@ object frmProductOrderList: TfrmProductOrderList
         Left = 0
         Top = 22
         Width = 1240
-        Height = 479
+        Height = 508
         Align = alClient
         Font.Charset = GB2312_CHARSET
         Font.Color = clBtnShadow
@@ -412,7 +412,7 @@ object frmProductOrderList: TfrmProductOrderList
       object cxTabControl1: TcxTabControl
         Left = 0
         Top = 0
-        Width = 1248
+        Width = 1240
         Height = 22
         Align = alTop
         TabOrder = 0
@@ -426,14 +426,14 @@ object frmProductOrderList: TfrmProductOrderList
           #20840#37096)
         OnChange = cxTabControl1Change
         ClientRectBottom = 22
-        ClientRectRight = 1248
+        ClientRectRight = 1240
         ClientRectTop = 22
       end
       object cxGrid1: TcxGrid
         Left = 0
         Top = 22
-        Width = 1248
-        Height = 516
+        Width = 1240
+        Height = 508
         Align = alClient
         PopupMenu = PopupMenu1
         TabOrder = 1
@@ -632,6 +632,12 @@ object frmProductOrderList: TfrmProductOrderList
             Options.Editing = False
             Width = 74
           end
+          object Tv1Column2: TcxGridDBColumn
+            Caption = #27454#21495
+            DataBinding.FieldName = 'PRTKuanNo'
+            HeaderAlignmentHorz = taCenter
+            Width = 67
+          end
         end
         object cxGrid1Level1: TcxGridLevel
           GridView = Tv1
@@ -642,7 +648,7 @@ object frmProductOrderList: TfrmProductOrderList
   object Panel2: TPanel
     Left = 0
     Top = 32
-    Width = 1248
+    Width = 1240
     Height = 65
     Align = alTop
     BevelInner = bvRaised
@@ -817,7 +823,7 @@ object frmProductOrderList: TfrmProductOrderList
   object Panel1: TPanel
     Left = 0
     Top = 97
-    Width = 1248
+    Width = 1240
     Height = 65
     Align = alTop
     BevelInner = bvRaised
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas
index 7260667..9836b21 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_ProductOrderList.pas
@@ -150,6 +150,7 @@ type
     V2Column6: TcxGridDBColumn;
     v1Column3: TcxGridDBColumn;
     Tv1Column1: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -275,7 +276,7 @@ begin
       Close;
       sql.Clear;
       SQL.Add('select AA.* from (');
-      sql.add('select A.*,B.SubId,B.XHNo,B.PRTColor,B.PRTPs,B.PRTOrderQty,B.OrderUnit');
+      sql.add('select A.*,B.SubId,B.XHNo,B.PRTColor,B.PRTPs,B.PRTOrderQty,B.OrderUnit,B.PRTKuanNo');
       sql.add('from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId');
       sql.Add('where A.FILLTime>=' + Quotedstr(formatdateTime('yyyy-MM-dd', begdate.Date)));
       sql.Add('and A.FILLTime<' + Quotedstr(formatdateTime('yyyy-MM-dd', enddate.Date + 1)));
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_ZdyAttachment.pas b/染整计划(DyeingFinishingPlan.dll)/U_ZdyAttachment.pas
index 771a01f..dbf80c3 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_ZdyAttachment.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_ZdyAttachment.pas
@@ -12,7 +12,21 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
-  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator;
+  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
+  dxSkinsCore, 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, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmZdyAttachment = class(TForm)