diff --git a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof
index e400b55..80f314d 100644
--- a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof
+++ b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\ÍØÐù\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe
+HostApplication=E:\ÏîÄ¿×ÊÁÏ\06_óÒ×¹«Ë¾\ÍØÐù\D7myTuoxuan\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg b/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg
index 7c050f6..9186cf8 100644
--- a/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg
+++ b/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg
@@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = testDll.exe ProductPrice.dll
+PROJECTS = DyeingFinishingPlan.dll testDll.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
+DyeingFinishingPlan.dll: DyeingFinishingPlan.dpr
+  $(DCC)
+
 testDll.exe: testDll.dpr
   $(DCC)
 
-ProductPrice.dll: ProductPrice.dpr
-  $(DCC)
-
 
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas
index aa2faf0..f4d0f15 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_GetDllForm.pas
@@ -74,18 +74,24 @@ begin
   SetLength(dtbase, 255);
   SetLength(user, 255);
   SetLength(pswd, 255);
-
-  server := '121.40.233.100,7781';
+  if Trim(DataBaseStr) = '' then
+  begin
+    server := '121.40.233.100,7781';
 //  server := '.';
-  dtbase := 'tuoxuan10data';
-  user := 'sa';
+    dtbase := 'tuoxuan10data';
+    user := 'sa';
 //  pswd := 'rightsoft@2333';
-  pswd := 'rightsoft@123';
+    pswd := 'rightsoft@123';
 //  pswd := 'rightsoft';
-  DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//  DConString := DataBaseStr;
+    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //   DName:='admin';
 //  DParameters1 := '¼Èë';
+  end
+  else
+  begin
+    DConString := DataBaseStr;
+  end;
+
   if not ConnData() then
   begin
     result := 0;
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm
index 89b25c4..8062bb1 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm
+++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm
@@ -20,7 +20,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1341
+    Width = 1349
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 107
@@ -114,7 +114,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1341
+    Width = 1349
     Height = 69
     Align = alTop
     BevelInner = bvRaised
@@ -226,7 +226,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
       ParentFont = False
     end
     object Label18: TLabel
-      Left = 1048
+      Left = 1192
       Top = 12
       Width = 52
       Height = 12
@@ -240,7 +240,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
     end
     object lbl1: TLabel
       Left = 867
-      Top = 11
+      Top = 12
       Width = 52
       Height = 12
       Caption = #20837#24211#21333#21495
@@ -253,7 +253,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
     end
     object Label2: TLabel
       Left = 867
-      Top = 35
+      Top = 36
       Width = 52
       Height = 12
       Caption = #26579#21378#32568#21495
@@ -266,7 +266,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
     end
     object Label14: TLabel
       Left = 1058
-      Top = 35
+      Top = 36
       Width = 26
       Height = 12
       Caption = #27454#21495
@@ -277,6 +277,19 @@ object frmJYOrderCDList: TfrmJYOrderCDList
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label1: TLabel
+      Left = 1032
+      Top = 12
+      Width = 52
+      Height = 12
+      Caption = #20135#21697#32534#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
       Left = 81
       Top = 8
@@ -360,7 +373,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
       OnKeyPress = conNOKeyPress
     end
     object ComboBox1: TComboBox
-      Left = 1104
+      Left = 1248
       Top = 8
       Width = 70
       Height = 20
@@ -394,7 +407,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
     object APID: TEdit
       Tag = 2
       Left = 922
-      Top = 7
+      Top = 8
       Width = 100
       Height = 20
       TabOrder = 10
@@ -403,7 +416,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
     object RCGangNo: TEdit
       Tag = 2
       Left = 922
-      Top = 31
+      Top = 32
       Width = 100
       Height = 20
       TabOrder = 11
@@ -412,7 +425,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList
     object KuanHao: TEdit
       Tag = 2
       Left = 1086
-      Top = 31
+      Top = 32
       Width = 100
       Height = 20
       TabOrder = 12
@@ -452,12 +465,21 @@ object frmJYOrderCDList: TfrmJYOrderCDList
         #24453#23450
         '')
     end
+    object MPRTCode: TEdit
+      Tag = 2
+      Left = 1086
+      Top = 8
+      Width = 100
+      Height = 20
+      TabOrder = 15
+      OnKeyPress = KHConNOKeyPress
+    end
   end
   object cxGrid1: TcxGrid
     Left = 0
     Top = 129
-    Width = 1341
-    Height = 553
+    Width = 1349
+    Height = 561
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -813,6 +835,13 @@ object frmJYOrderCDList: TfrmJYOrderCDList
         Options.Editing = False
         Width = 67
       end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'MPRTCode'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -963,14 +992,14 @@ object frmJYOrderCDList: TfrmJYOrderCDList
   object Panel6: TPanel
     Left = 0
     Top = 101
-    Width = 1341
+    Width = 1349
     Height = 28
     Align = alTop
     AutoSize = True
     BorderStyle = bsSingle
     TabOrder = 2
     DesignSize = (
-      1337
+      1345
       24)
     object Label31: TLabel
       Left = 25
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas
index 52d35bc..ae361d7 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas
@@ -154,6 +154,9 @@ type
     Tv1Column1: TcxGridDBColumn;
     Tv1Column2: TcxGridDBColumn;
     ToolButton4: TToolButton;
+    Label1: TLabel;
+    MPRTCode: TEdit;
+    Tv1Column3: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
diff --git a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas
index 32b51a6..ca573c2 100644
--- a/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas
+++ b/染整计划(DyeingFinishingPlan.dll)/U_OrderInPut.pas
@@ -12,7 +12,20 @@ uses
   cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxDropDownEdit,
   RM_Common, RM_Preview, RM_System, RM_Class, RM_GridReport, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, 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
   TfrmOrderInPut = class(TForm)