diff --git a/发货申请(ShipmentRequest.dll)/ShipmentRequest.dof b/发货申请(ShipmentRequest.dll)/ShipmentRequest.dof
index dc30de3..2fa0636 100644
--- a/发货申请(ShipmentRequest.dll)/ShipmentRequest.dof
+++ b/发货申请(ShipmentRequest.dll)/ShipmentRequest.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\��Ŀ����\���\��������(ShipmentRequest.dll)\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7zzXiangHeng\��������(ShipmentRequest.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/发货申请(ShipmentRequest.dll)/U_GetDllForm.pas b/发货申请(ShipmentRequest.dll)/U_GetDllForm.pas
index 825e03e..8ee9ac3 100644
--- a/发货申请(ShipmentRequest.dll)/U_GetDllForm.pas
+++ b/发货申请(ShipmentRequest.dll)/U_GetDllForm.pas
@@ -67,15 +67,15 @@ begin
   SetLength(user, 255);
   SetLength(pswd, 255);
 
-  user := 'rtsa';
+  user := 'longfengsa';
   dtbase := 'xianghengdata';
-  server := '101.132.143.144,7781';
-  pswd := 'rightsoft@5740';
+  server := '116.62.5.81,7781';
+  pswd := 'rightsoft@81';
 
 //  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 := DataBaseStr;
 //   DName:='�ܸ���';
 //   DParameters1:='��Ȩ��';
    //DParameters3:='1';
diff --git a/坯布仓库(GreyClothWarehouse.dll)/GreyClothWarehouse.dof b/坯布仓库(GreyClothWarehouse.dll)/GreyClothWarehouse.dof
index a4ff415..38703d0 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/GreyClothWarehouse.dof
+++ b/坯布仓库(GreyClothWarehouse.dll)/GreyClothWarehouse.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\��Ŀ����\���\�����ֿ�(GreyClothWarehouse.dll)\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7zzXiangHeng\�����ֿ�(GreyClothWarehouse.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/坯布仓库(GreyClothWarehouse.dll)/ProjectGroup1.bpg b/坯布仓库(GreyClothWarehouse.dll)/ProjectGroup1.bpg
index 7c050f6..7ee0f71 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/ProjectGroup1.bpg
+++ b/坯布仓库(GreyClothWarehouse.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 = GreyClothWarehouse.dll testDll.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
+GreyClothWarehouse.dll: GreyClothWarehouse.dpr
+  $(DCC)
+
 testDll.exe: testDll.dpr
   $(DCC)
 
-ProductPrice.dll: ProductPrice.dpr
-  $(DCC)
-
 
diff --git a/坯布仓库(GreyClothWarehouse.dll)/ProjectGroup1.~bpg b/坯布仓库(GreyClothWarehouse.dll)/ProjectGroup1.~bpg
new file mode 100644
index 0000000..7c050f6
--- /dev/null
+++ b/坯布仓库(GreyClothWarehouse.dll)/ProjectGroup1.~bpg
@@ -0,0 +1,23 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = testDll.exe ProductPrice.dll
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+testDll.exe: testDll.dpr
+  $(DCC)
+
+ProductPrice.dll: ProductPrice.dpr
+  $(DCC)
+
+
diff --git a/坯布仓库(GreyClothWarehouse.dll)/U_DataLink.pas b/坯布仓库(GreyClothWarehouse.dll)/U_DataLink.pas
index adb5bb3..5d1f48e 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/U_DataLink.pas
+++ b/坯布仓库(GreyClothWarehouse.dll)/U_DataLink.pas
@@ -5,7 +5,20 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, SyncObjs, ExtCtrls,
-  cxClasses, dxSkinsCore, dxSkinsDefaultPainters;
+  cxClasses, dxSkinsCore, dxSkinsDefaultPainters, 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
   TMyThread = class(TThread)
diff --git a/坯布仓库(GreyClothWarehouse.dll)/U_GetDllForm.pas b/坯布仓库(GreyClothWarehouse.dll)/U_GetDllForm.pas
index ecf6368..c486b69 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/U_GetDllForm.pas
+++ b/坯布仓库(GreyClothWarehouse.dll)/U_GetDllForm.pas
@@ -70,13 +70,12 @@ begin
   SetLength(user, 255);
   SetLength(pswd, 255);
 
-  user := 'rtsa';
+  user := 'longfengsa';
   dtbase := 'xianghengdata';
-  server := '101.132.143.144,7781';
-  pswd := 'rightsoft@5740';
-//  pswd := 'rightsoft';
+  server := '116.62.5.81,7781';
+  pswd := 'rightsoft@81';
   DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-  DConString := DataBaseStr;
+//  DConString := DataBaseStr;
 //   DName:='�ܸ���';
    //DParameters1:='��Ȩ��';   //��Ȩ��
    //DParameters3:='1';
diff --git a/坯布仓库(GreyClothWarehouse.dll)/U_PBKCListSel.pas b/坯布仓库(GreyClothWarehouse.dll)/U_PBKCListSel.pas
index fe81b91..aa08084 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/U_PBKCListSel.pas
+++ b/坯布仓库(GreyClothWarehouse.dll)/U_PBKCListSel.pas
@@ -11,7 +11,18 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, MovePanel, Menus, cxCheckBox, 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
   TfrmPBKCListSel = class(TForm)
@@ -144,6 +155,10 @@ begin
         SQL.Add(' and  jhchejian=' + QuotedStr(Trim(jhCheJian.Text)));
       end;
 
+      if Trim(C_CodeName.Text) <> '' then
+      begin
+        SQL.Add(' and C.C_CodeName like ''%''+ Trim(C_CodeName.Text) +''%''');
+      end; 
 //      SQL.Add(' and E.FSID=' + quotedstr(FCKOrdNo) + ')');
 //      ShowMessage(SQL.Text);
       Open;
diff --git a/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.dfm b/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.dfm
index b9c7831..5b4fe65 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.dfm
+++ b/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.dfm
@@ -161,7 +161,7 @@ object frmPBSMCK: TfrmPBSMCK
     object Label33: TLabel
       Left = 6
       Top = 232
-      Width = 80
+      Width = 72
       Height = 23
       Caption = #24378#21046#21457#36135
       Font.Charset = ANSI_CHARSET
diff --git a/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.pas b/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.pas
index 87fd96d..6209fd9 100644
--- a/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.pas
+++ b/坯布仓库(GreyClothWarehouse.dll)/U_PBSMCK.pas
@@ -11,7 +11,21 @@ uses
   cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, BtnEdit, ShellAPI, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, cxMaskEdit,
   cxButtonEdit, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport,
-  RM_e_Xls, dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter;
+  RM_e_Xls, dxSkinsCore, dxSkinsDefaultPainters, 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
   TfrmPBSMCK = class(TForm)