diff --git a/A00通用窗体/U_AttachmentUpload.pas b/A00通用窗体/U_AttachmentUpload.pas
index 9f66f66..3726095 100644
--- a/A00通用窗体/U_AttachmentUpload.pas
+++ b/A00通用窗体/U_AttachmentUpload.pas
@@ -9,7 +9,7 @@ uses
   IdTCPClient, IdFTP, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
   cxDataStorage, cxEdit, cxDBData, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView,
-  cxGrid, cxLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxGrid, cxLookAndFeels,   cxNavigator,
   dxDateRanges, IdExplicitTLSClientServerBase, System.ImageList, U_BaseHelp;
 
 type
diff --git a/A00通用窗体/U_BankSel.pas b/A00通用窗体/U_BankSel.pas
index 6f7551a..e2c9b30 100644
--- a/A00通用窗体/U_BankSel.pas
+++ b/A00通用窗体/U_BankSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
   cxDropDownEdit;
 
diff --git a/A00通用窗体/U_ClothInfoSel.pas b/A00通用窗体/U_ClothInfoSel.pas
index 7da75f0..8d6e830 100644
--- a/A00通用窗体/U_ClothInfoSel.pas
+++ b/A00通用窗体/U_ClothInfoSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxTL,
   cxMaskEdit, cxTLdxBarBuiltInMenu, cxCheckBox, cxInplaceContainer, cxDBTL,
   cxTLData, math;
diff --git a/A00通用窗体/U_CompanySel.pas b/A00通用窗体/U_CompanySel.pas
index 0a503ea..c34427c 100644
--- a/A00通用窗体/U_CompanySel.pas
+++ b/A00通用窗体/U_CompanySel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput;
 
 type
diff --git a/A00通用窗体/U_LablePrint.pas b/A00通用窗体/U_LablePrint.pas
index 4b16b9b..9731e1c 100644
--- a/A00通用窗体/U_LablePrint.pas
+++ b/A00通用窗体/U_LablePrint.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, RM_Common,
   RM_Class, RM_GridReport, RM_Dataset, Vcl.Buttons, RM_E_llPDF, RM_BarCode,
   RM_e_Graphic, RM_e_Jpeg, RM_e_Xls, cxContainer, cxMaskEdit, cxDropDownEdit,
diff --git a/A00通用窗体/U_LbaelMapSet.pas b/A00通用窗体/U_LbaelMapSet.pas
index 927592c..94689b1 100644
--- a/A00通用窗体/U_LbaelMapSet.pas
+++ b/A00通用窗体/U_LbaelMapSet.pas
@@ -13,8 +13,8 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, System.ImageList,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu, System.ImageList,
   Vcl.ImgList, U_BaseHelp;
 
 type
diff --git a/A00通用窗体/U_ProductInfoSel.pas b/A00通用窗体/U_ProductInfoSel.pas
index e59f194..943e205 100644
--- a/A00通用窗体/U_ProductInfoSel.pas
+++ b/A00通用窗体/U_ProductInfoSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
   cxDropDownEdit;
 
diff --git a/A00通用窗体/U_UserSel.pas b/A00通用窗体/U_UserSel.pas
index 900602c..27d00f2 100644
--- a/A00通用窗体/U_UserSel.pas
+++ b/A00通用窗体/U_UserSel.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
-  dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, U_BaseHelp,
+    cxNavigator, dxDateRanges, U_BaseHelp,
   dxBarBuiltInMenu, System.ImageList, Vcl.ImgList;
 
 type
diff --git a/A00通用窗体/U_YarnInfoSel.pas b/A00通用窗体/U_YarnInfoSel.pas
index 2d25edc..6756a43 100644
--- a/A00通用窗体/U_YarnInfoSel.pas
+++ b/A00通用窗体/U_YarnInfoSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit;
 
 type
diff --git a/A01基础公司管理/U_BankList.pas b/A01基础公司管理/U_BankList.pas
index 73534dd..d8bf52d 100644
--- a/A01基础公司管理/U_BankList.pas
+++ b/A01基础公司管理/U_BankList.pas
@@ -13,8 +13,8 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
   TfrmBankList = class(TfrmBaseList)
diff --git a/A01基础公司管理/U_Company.pas b/A01基础公司管理/U_Company.pas
index 53fa065..50a864b 100644
--- a/A01基础公司管理/U_Company.pas
+++ b/A01基础公司管理/U_Company.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator, U_BaseList,   dxDateRanges,
   dxBarBuiltInMenu;
 
 type
diff --git a/A01基础公司管理/U_CustInput.pas b/A01基础公司管理/U_CustInput.pas
index 915697f..404f8b1 100644
--- a/A01基础公司管理/U_CustInput.pas
+++ b/A01基础公司管理/U_CustInput.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator,   dxDateRanges,
   dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/A01基础公司管理/U_Customer.pas b/A01基础公司管理/U_Customer.pas
index 3723d65..e91f415 100644
--- a/A01基础公司管理/U_Customer.pas
+++ b/A01基础公司管理/U_Customer.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator, U_BaseList,   dxDateRanges,
   dxBarBuiltInMenu, cxPC;
 
 type
diff --git a/A01基础公司管理/U_CustomerInput.pas b/A01基础公司管理/U_CustomerInput.pas
index 96ad443..f6d97b2 100644
--- a/A01基础公司管理/U_CustomerInput.pas
+++ b/A01基础公司管理/U_CustomerInput.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator,   dxDateRanges,
   dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, cxDateUtils, cxImage,
   cxDBEdit, IdExplicitTLSClientServerBase;
 
diff --git a/A01基础公司管理/U_DataLink.pas b/A01基础公司管理/U_DataLink.pas
index d03eed9..7479fb5 100644
--- a/A01基础公司管理/U_DataLink.pas
+++ b/A01基础公司管理/U_DataLink.pas
@@ -4,8 +4,8 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, dxSkinsCore,
-  dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs;
+  Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, 
+   System.ImageList, Vcl.ExtCtrls, SyncObjs;
 
 type
   TMyThread = class(TThread)
diff --git a/A01基础公司管理/U_DeptTypeHelp.pas b/A01基础公司管理/U_DeptTypeHelp.pas
index 2b405a6..aecfea3 100644
--- a/A01基础公司管理/U_DeptTypeHelp.pas
+++ b/A01基础公司管理/U_DeptTypeHelp.pas
@@ -6,7 +6,7 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit,
   cxInplaceContainer, cxDBTL, cxControls, cxTLData, DB, ADODB, cxLookAndFeels,
-  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxSkinsCore,
+  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, 
   dxSkinsDefaultPainters;
 
 type
diff --git a/A01基础公司管理/U_EmployeeInPut.pas b/A01基础公司管理/U_EmployeeInPut.pas
index abfcf6d..de4031c 100644
--- a/A01基础公司管理/U_EmployeeInPut.pas
+++ b/A01基础公司管理/U_EmployeeInPut.pas
@@ -11,8 +11,8 @@ uses
   StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
   cxDropDownEdit, jpeg, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, cxPC, cxGridCustomPopupMenu, cxGridPopupMenu, Menus,
-  ExtDlgs, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu;
+  ExtDlgs, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu;
 
 type
   TfrmYGInPut = class(TForm)
diff --git a/A01基础公司管理/U_EmployeeList.pas b/A01基础公司管理/U_EmployeeList.pas
index 51e18ee..80c05af 100644
--- a/A01基础公司管理/U_EmployeeList.pas
+++ b/A01基础公司管理/U_EmployeeList.pas
@@ -12,7 +12,7 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
   cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData,
   cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu,
-  cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges;
+  cxNavigator, U_BaseList,   dxDateRanges;
 
 type
   TfrmEmployeeList = class(TfrmBaseList)
diff --git a/A01基础公司管理/U_Factory.pas b/A01基础公司管理/U_Factory.pas
index c06fb26..e236691 100644
--- a/A01基础公司管理/U_Factory.pas
+++ b/A01基础公司管理/U_Factory.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator,   dxDateRanges,
   dxBarBuiltInMenu, U_BaseList, cxPC;
 
 type
diff --git a/A01基础公司管理/U_FactoryInput.pas b/A01基础公司管理/U_FactoryInput.pas
index 7a483c0..fcd74e4 100644
--- a/A01基础公司管理/U_FactoryInput.pas
+++ b/A01基础公司管理/U_FactoryInput.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator,   dxDateRanges,
   dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/A01基础公司管理/U_GCFactory.pas b/A01基础公司管理/U_GCFactory.pas
index ec7739c..fdc9dae 100644
--- a/A01基础公司管理/U_GCFactory.pas
+++ b/A01基础公司管理/U_GCFactory.pas
@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxGridBandedTableView,
   cxGridDBBandedTableView, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu;
+    dxDateRanges, dxBarBuiltInMenu;
 
 type
   FdDy = record
diff --git a/A01基础公司管理/U_MGFactory.pas b/A01基础公司管理/U_MGFactory.pas
index a542719..1fa9281 100644
--- a/A01基础公司管理/U_MGFactory.pas
+++ b/A01基础公司管理/U_MGFactory.pas
@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxGridBandedTableView,
   cxGridDBBandedTableView, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,U_BaseList;
+    dxDateRanges, dxBarBuiltInMenu,U_BaseList;
 
 type
   FdDy = record
diff --git a/A01基础公司管理/U_SYDept.pas b/A01基础公司管理/U_SYDept.pas
index 43d9250..884d562 100644
--- a/A01基础公司管理/U_SYDept.pas
+++ b/A01基础公司管理/U_SYDept.pas
@@ -10,7 +10,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxGridCustomView, cxGrid, cxTextEdit, cxLookAndFeels,
   cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, cxNavigator, U_BaseList,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges;
+    dxDateRanges;
 
 type
   TfrmSYDept = class(TfrmBaseList)
diff --git a/A01基础公司管理/U_YGListSel.pas b/A01基础公司管理/U_YGListSel.pas
index 189dd8b..6462051 100644
--- a/A01基础公司管理/U_YGListSel.pas
+++ b/A01基础公司管理/U_YGListSel.pas
@@ -12,7 +12,7 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
   cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData,
   cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu,
-  cxNavigator, U_BaseHelp, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator, U_BaseHelp,   dxDateRanges,
   RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, cxGridBandedTableView,
   cxGridDBBandedTableView, U_BaseList, System.ImageList, Vcl.ImgList;
 
diff --git a/A01基础公司管理/U_YGSel.pas b/A01基础公司管理/U_YGSel.pas
index 4558110..81e31b8 100644
--- a/A01基础公司管理/U_YGSel.pas
+++ b/A01基础公司管理/U_YGSel.pas
@@ -12,7 +12,7 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit,
   cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData,
   cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu,
-  cxNavigator, U_BaseHelp, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator, U_BaseHelp,   dxDateRanges,
   RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, cxGridBandedTableView,
   cxGridDBBandedTableView, U_BaseList, System.ImageList, Vcl.ImgList;
 
diff --git a/A01基础公司管理/U_YWYSel.pas b/A01基础公司管理/U_YWYSel.pas
index 1c1adda..0b9004b 100644
--- a/A01基础公司管理/U_YWYSel.pas
+++ b/A01基础公司管理/U_YWYSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList;
 
 type
diff --git a/A01基础公司管理/U_ZDYHelp.pas b/A01基础公司管理/U_ZDYHelp.pas
index 8540272..908bf91 100644
--- a/A01基础公司管理/U_ZDYHelp.pas
+++ b/A01基础公司管理/U_ZDYHelp.pas
@@ -9,8 +9,8 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel,
   cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList,
   StdCtrls, ExtCtrls, cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu,
-  cxTimeEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu;
+  cxTimeEdit, cxLookAndFeels, cxLookAndFeelPainters, 
+   cxNavigator, dxDateRanges, dxBarBuiltInMenu;
 
 type
   TfrmZDYHelp = class(TForm)
diff --git a/A01基础公司管理/U_ZdyAttachGYS.pas b/A01基础公司管理/U_ZdyAttachGYS.pas
index 2ed21b7..dd3c455 100644
--- a/A01基础公司管理/U_ZdyAttachGYS.pas
+++ b/A01基础公司管理/U_ZdyAttachGYS.pas
@@ -12,8 +12,8 @@ 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, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
   TfrmZdyAttachGYS = class(TForm )
diff --git a/A02基础产品管理/U_CloInfoFileUp.pas b/A02基础产品管理/U_CloInfoFileUp.pas
index ae68df6..d498427 100644
--- a/A02基础产品管理/U_CloInfoFileUp.pas
+++ b/A02基础产品管理/U_CloInfoFileUp.pas
@@ -9,8 +9,8 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, IdBaseComponent, IdComponent,
   IdTCPConnection, IdTCPClient, IdFTP, StdCtrls, ADODB, jpeg, BtnEdit, IniFiles,
-  strutils, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, IdExplicitTLSClientServerBase,
+  strutils, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, IdExplicitTLSClientServerBase,
   Vcl.ExtDlgs;
 
 type
diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas
index 743baac..3a2063e 100644
--- a/A02基础产品管理/U_ClothInfo.pas
+++ b/A02基础产品管理/U_ClothInfo.pas
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, jpeg, U_SLT, ComObj, Menus,
   cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, cxNavigator,
-  dxBarBuiltInMenu, cxPC, Math, RM_BarCode, dxSkinsCore, dxSkinsDefaultPainters,
+  dxBarBuiltInMenu, cxPC, Math, RM_BarCode,  
   dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, cxContainer,
   dxDBBarCode, dxBarCode, Vcl.Clipbrd, cxTextEdit, BtnEdit, StrUtils;
 
diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas
index 697b500..95780b7 100644
--- a/A02基础产品管理/U_ClothInfoInput.pas
+++ b/A02基础产品管理/U_ClothInfoInput.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
   cxGrid, ComCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, cxTextEdit,
   cxButtonEdit, StdCtrls, ExtCtrls, cxCurrencyEdit, BtnEdit, U_BaseList,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu;
 
 type
diff --git a/A02基础产品管理/U_ClothType.pas b/A02基础产品管理/U_ClothType.pas
index 6bbd3d8..a2a4e55 100644
--- a/A02基础产品管理/U_ClothType.pas
+++ b/A02基础产品管理/U_ClothType.pas
@@ -7,7 +7,7 @@ uses
   Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
   cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
   ExtCtrls, DBClient, U_BaseList, cxLookAndFeels, cxLookAndFeelPainters,
-  cxTLdxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters;
+  cxTLdxBarBuiltInMenu,  dxSkinsDefaultPainters;
 
 type
   TfrmClothType = class(TfrmBaseList)
diff --git a/A02基础产品管理/U_DataLink.pas b/A02基础产品管理/U_DataLink.pas
index 6765773..c05f016 100644
--- a/A02基础产品管理/U_DataLink.pas
+++ b/A02基础产品管理/U_DataLink.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+    System.ImageList;
 
 type
   TMyThread = class(TThread)
diff --git a/A02基础产品管理/U_SLT.pas b/A02基础产品管理/U_SLT.pas
index ee45601..9f3e881 100644
--- a/A02基础产品管理/U_SLT.pas
+++ b/A02基础产品管理/U_SLT.pas
@@ -5,7 +5,7 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, ExtCtrls, jpeg, cxControls, cxContainer, cxEdit, cxImage, IdFTP,
-  ShellAPI, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
+  ShellAPI, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters, 
   dxSkinsDefaultPainters;
 
 type
diff --git a/A02基础产品管理/U_YPTypeHelpCP.pas b/A02基础产品管理/U_YPTypeHelpCP.pas
index 5fe4766..ef5f3ef 100644
--- a/A02基础产品管理/U_YPTypeHelpCP.pas
+++ b/A02基础产品管理/U_YPTypeHelpCP.pas
@@ -6,7 +6,7 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit,
   cxInplaceContainer, cxDBTL, cxControls, cxTLData, DB, ADODB, cxLookAndFeels,
-  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxSkinsCore,
+  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, 
   dxSkinsDefaultPainters;
 
 type
diff --git a/G00贸易通用窗体/U_TradePlanSel.pas b/G00贸易通用窗体/U_TradePlanSel.pas
index 6663db7..5f7c081 100644
--- a/G00贸易通用窗体/U_TradePlanSel.pas
+++ b/G00贸易通用窗体/U_TradePlanSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox,
   cxCalendar;
 
diff --git a/G00贸易通用窗体/U_TradeSalesContractSel.pas b/G00贸易通用窗体/U_TradeSalesContractSel.pas
index c1f6330..4fb7ba7 100644
--- a/G00贸易通用窗体/U_TradeSalesContractSel.pas
+++ b/G00贸易通用窗体/U_TradeSalesContractSel.pas
@@ -9,7 +9,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  cxLookAndFeelPainters,   cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
   cxDropDownEdit, cxCheckBox, Vcl.Menus;
 
diff --git a/G01贸易生产计划/ProjectGroup1.groupproj.local b/G01贸易生产计划/ProjectGroup1.groupproj.local
index aa26721..73e9e1f 100644
--- a/G01贸易生产计划/ProjectGroup1.groupproj.local
+++ b/G01贸易生产计划/ProjectGroup1.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\泽晟\G01贸易生产计划\TradePlan.dproj"/>
+		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myZesheng\G01贸易生产计划\TradePlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/G01贸易生产计划/TradePlan.dproj b/G01贸易生产计划/TradePlan.dproj
index 9487621..8c6cf9b 100644
--- a/G01贸易生产计划/TradePlan.dproj
+++ b/G01贸易生产计划/TradePlan.dproj
@@ -124,7 +124,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\泽晟\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myZesheng\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
diff --git a/G01贸易生产计划/TradePlan.dproj.local b/G01贸易生产计划/TradePlan.dproj.local
index ed0c164..0c5c7ce 100644
--- a/G01贸易生产计划/TradePlan.dproj.local
+++ b/G01贸易生产计划/TradePlan.dproj.local
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.134,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -60,7 +60,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\泽晟"/>
+    <File Path="..\..\D10myZesheng"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
@@ -100,9 +100,9 @@
     <File Path="U_DataLink.dfm"/>
     <File Path="U_GetDllForm.pas"/>
     <File Path="U_iniParam.pas"/>
-    <File Path="U_TradePlanList.pas"/>
-    <File Path="U_TradePlanList.dfm"/>
     <File Path="U_TradeInspSet.pas"/>
     <File Path="U_TradeInspSet.dfm"/>
+    <File Path="U_TradePlanList.pas"/>
+    <File Path="U_TradePlanList.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>
diff --git a/G01贸易生产计划/TradePlan.identcache b/G01贸易生产计划/TradePlan.identcache
index b1d3bed..2438d22 100644
Binary files a/G01贸易生产计划/TradePlan.identcache and b/G01贸易生产计划/TradePlan.identcache differ
diff --git a/G01贸易生产计划/U_DataLink.pas b/G01贸易生产计划/U_DataLink.pas
index 9273e7c..659a9e4 100644
--- a/G01贸易生产计划/U_DataLink.pas
+++ b/G01贸易生产计划/U_DataLink.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+    System.ImageList;
 
 type
   TMyThread = class(TThread)
diff --git a/G01贸易生产计划/U_LabelList.pas b/G01贸易生产计划/U_LabelList.pas
index e1b1557..238ad22 100644
--- a/G01贸易生产计划/U_LabelList.pas
+++ b/G01贸易生产计划/U_LabelList.pas
@@ -10,8 +10,8 @@ uses
   cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit,
   cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges;
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges;
 
 type
   TfrmLabelList = class(TForm)
diff --git a/G01贸易生产计划/U_TradeInspSet.dfm b/G01贸易生产计划/U_TradeInspSet.dfm
index 0159983..e0d37f5 100644
--- a/G01贸易生产计划/U_TradeInspSet.dfm
+++ b/G01贸易生产计划/U_TradeInspSet.dfm
@@ -213,6 +213,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet
       Height = 20
       ReadOnly = True
       TabOrder = 3
+      OnDblClick = LabVolumeDblClick
     end
     object LabPackage: TEdit
       Tag = 2
@@ -222,6 +223,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet
       Height = 20
       ReadOnly = True
       TabOrder = 4
+      OnDblClick = LabPackageDblClick
     end
     object RulePieceNo: TComboBox
       Tag = 2
@@ -328,6 +330,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet
             TabOrder = 0
             object TVLabel: TcxGridDBTableView
               Navigator.Buttons.CustomButtons = <>
+              ScrollbarAnnotations.CustomAnnotations = <>
               OnCellClick = TVLabelCellClick
               DataController.DataSource = DS_Label
               DataController.Filter.AutoDataSetFilter = True
@@ -340,24 +343,28 @@ inherited frmTradeInspSet: TfrmTradeInspSet
               object TVLabellabelId: TcxGridDBColumn
                 Caption = #26631#31614'ID'
                 DataBinding.FieldName = 'labelId'
+                DataBinding.IsNullValueType = True
                 Visible = False
                 Width = 53
               end
               object TVLabellabeltype: TcxGridDBColumn
                 Caption = #26631#31614#31867#22411
                 DataBinding.FieldName = 'labeltype'
+                DataBinding.IsNullValueType = True
                 HeaderAlignmentHorz = taCenter
                 Width = 107
               end
               object TVLabellabelCaption: TcxGridDBColumn
                 Caption = #26631#31614#21517#31216
                 DataBinding.FieldName = 'labelCaption'
+                DataBinding.IsNullValueType = True
                 HeaderAlignmentHorz = taCenter
                 Width = 261
               end
               object TVLabellabelFile: TcxGridDBColumn
                 Caption = #25991#20214#21517
                 DataBinding.FieldName = 'labelFile'
+                DataBinding.IsNullValueType = True
                 Visible = False
                 HeaderAlignmentHorz = taCenter
                 Width = 167
@@ -365,6 +372,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet
               object TVLabelColumn2: TcxGridDBColumn
                 Caption = #25805#20316#26102#38388
                 DataBinding.FieldName = 'EditTime'
+                DataBinding.IsNullValueType = True
                 HeaderAlignmentHorz = taCenter
                 Options.Editing = False
                 Width = 99
@@ -372,6 +380,7 @@ inherited frmTradeInspSet: TfrmTradeInspSet
               object TVLabelColumn1: TcxGridDBColumn
                 Caption = #25805#20316#20154
                 DataBinding.FieldName = 'Editer'
+                DataBinding.IsNullValueType = True
                 HeaderAlignmentHorz = taCenter
                 Options.Editing = False
                 Width = 80
diff --git a/G01贸易生产计划/U_TradeInspSet.pas b/G01贸易生产计划/U_TradeInspSet.pas
index a10a0fd..f575a90 100644
--- a/G01贸易生产计划/U_TradeInspSet.pas
+++ b/G01贸易生产计划/U_TradeInspSet.pas
@@ -13,10 +13,10 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, cxDateUtils, cxImage,
-  cxDBEdit, IdExplicitTLSClientServerBase, RM_Preview, cxPC, U_BaseHelp,
-  System.ImageList, Vcl.ImgList, RTComboBox, RM_BarCode, RM_e_Xls;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore,
+  cxDateUtils, cxImage, cxDBEdit, IdExplicitTLSClientServerBase, RM_Preview,
+  cxPC, U_BaseHelp, System.ImageList, Vcl.ImgList, RTComboBox, RM_BarCode,
+  RM_e_Xls, dxScrollbarAnnotations;
 
 type
   TfrmTradeInspSet = class(TfrmBaseHelp)
@@ -102,6 +102,8 @@ type
     procedure ToolButton4Click(Sender: TObject);
     procedure LabelTypeChange(Sender: TObject);
     procedure TVLabelCellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+    procedure LabVolumeDblClick(Sender: TObject);
+    procedure LabPackageDblClick(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
@@ -222,9 +224,18 @@ begin
 
 end;
 
+procedure TfrmTradeInspSet.LabPackageDblClick(Sender: TObject);
+begin
+  LabPackage.Text := '';
+end;
+
+procedure TfrmTradeInspSet.LabVolumeDblClick(Sender: TObject);
+begin
+  LabVolume.Text := '';
+end;
+
 procedure TfrmTradeInspSet.InitGrid();
 begin
-
   with ADOQueryTemp do
   begin
     Close;
diff --git a/G01贸易生产计划/U_TradePlanInPut.dfm b/G01贸易生产计划/U_TradePlanInPut.dfm
index dd10cc2..f01c03a 100644
--- a/G01贸易生产计划/U_TradePlanInPut.dfm
+++ b/G01贸易生产计划/U_TradePlanInPut.dfm
@@ -350,6 +350,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       TabOrder = 4
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DSFact
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -381,12 +382,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         object V2Column2: TcxGridDBColumn
           Caption = #24207#21495
           DataBinding.FieldName = 'SerialNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 66
         end
         object TV2Column1: TcxGridDBColumn
           Caption = #24037#33402
           DataBinding.FieldName = 'Technics'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -400,6 +403,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         object V2Column3: TcxGridDBColumn
           Caption = #32534#21495
           DataBinding.FieldName = 'FtyNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 82
@@ -407,6 +411,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         object V2Column1: TcxGridDBColumn
           Caption = #21152#24037#21378
           DataBinding.FieldName = 'FtyName'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -420,6 +425,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         object TV2Column5: TcxGridDBColumn
           Caption = #36319#21333#21592
           DataBinding.FieldName = 'FollowMan'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -572,6 +578,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     object Tv1: TcxGridDBTableView
       OnMouseDown = Tv1MouseDown
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -620,6 +627,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         Tag = 99
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -630,12 +638,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object v1Column4: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 102
       end
       object v1PRTColor: TcxGridDBColumn
         Caption = #33521#25991#39068#33394
         DataBinding.FieldName = 'C_EColor'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -650,6 +660,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object v1Column5: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 99
@@ -657,12 +668,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object VC_PRTPs: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 112
       end
       object v1PRTOrderQty: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -672,24 +685,28 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object Tv1Column1: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 73
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'OrdSNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 105
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 77
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #20013#25991#39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 83
       end
diff --git a/G01贸易生产计划/U_TradePlanInPut.pas b/G01贸易生产计划/U_TradePlanInPut.pas
index 94f3215..41984e4 100644
--- a/G01贸易生产计划/U_TradePlanInPut.pas
+++ b/G01贸易生产计划/U_TradePlanInPut.pas
@@ -12,10 +12,10 @@ uses
   cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxDropDownEdit,
   RM_Common, RM_Preview, RM_System, RM_Class, RM_GridReport, RM_Dataset, Menus,
   cxSplitter, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCheckBox,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, cxPC,
+    dxDateRanges, dxBarBuiltInMenu, cxPC,
   System.ImageList, Vcl.ImgList, U_BaseInput, cxImage, cxDBEdit, IdBaseComponent,
   IdComponent, IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase,
-  IdFTP, ShellAPI;
+  IdFTP, ShellAPI, dxScrollbarAnnotations;
 
 type
   TfrmTradePlanInPut = class(TfrmBaseInput)
diff --git a/G01贸易生产计划/U_TradePlanList.dfm b/G01贸易生产计划/U_TradePlanList.dfm
index 45622c1..9d09242 100644
--- a/G01贸易生产计划/U_TradePlanList.dfm
+++ b/G01贸易生产计划/U_TradePlanList.dfm
@@ -343,6 +343,7 @@ inherited frmTradePlanList: TfrmTradePlanList
     TabOrder = 3
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
       DataController.DataSource = DataSource1
@@ -372,6 +373,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object v1Column16: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -380,6 +382,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object v1OrdDate: TcxGridDBColumn
         Caption = #21046#21333#26085#26399
         DataBinding.FieldName = 'OrdDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -390,6 +393,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column2: TcxGridDBColumn
         Caption = #32463#33829#21333#20301
         DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradePlan.FontBlue
@@ -398,6 +402,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradePlan.FoneClMaroon
@@ -406,6 +411,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object v1OrderNo: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_TradePlan.Default
@@ -414,6 +420,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         OnCustomDrawCell = v1DeliveryDateCustomDrawCell
@@ -425,12 +432,14 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column3: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column22: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 89
@@ -438,6 +447,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column12: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 72
@@ -445,6 +455,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column13: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 68
@@ -452,12 +463,14 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column14: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column15: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 72
@@ -465,12 +478,14 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column16: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column11: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'HZPiQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 54
@@ -478,6 +493,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column10: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -486,6 +502,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object v1Column11: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -494,6 +511,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column6: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'FILLER'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 72
@@ -501,6 +519,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column1: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 99
@@ -508,6 +527,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object Tv1Column5: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
@@ -569,6 +589,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       TabOrder = 0
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DataSource2
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -618,6 +639,7 @@ inherited frmTradePlanList: TfrmTradePlanList
           Tag = 99
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           Properties.ImmediatePost = True
           Properties.NullStyle = nssUnchecked
@@ -630,6 +652,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object v1PRTColor: TcxGridDBColumn
           Caption = #33521#25991#39068#33394
           DataBinding.FieldName = 'C_EColor'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -645,6 +668,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object cxGridDBColumn4: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -652,6 +676,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object v1Column5: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -665,6 +690,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object VC_PRTPs: TcxGridDBColumn
           Caption = #21305#25968
           DataBinding.FieldName = 'OrdPiece'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -672,6 +698,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object v1PRTOrderQty: TcxGridDBColumn
           Caption = #25968#37327
           DataBinding.FieldName = 'OrdQty'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
@@ -681,6 +708,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object v1OrderUnit: TcxGridDBColumn
           Caption = #21333#20301
           DataBinding.FieldName = 'OrdUnit'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxComboBoxProperties'
           Properties.Items.Strings = (
             'M'
@@ -694,6 +722,7 @@ inherited frmTradePlanList: TfrmTradePlanList
         object cxGridDBColumn7: TcxGridDBColumn
           Caption = #22791#27880
           DataBinding.FieldName = 'OrdSNote'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -701,12 +730,14 @@ inherited frmTradePlanList: TfrmTradePlanList
         object TV2Column1: TcxGridDBColumn
           Caption = #27454#21495
           DataBinding.FieldName = 'C_StyleNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 66
         end
         object TV2Column2: TcxGridDBColumn
           Caption = #20013#25991#39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 66
         end
@@ -725,6 +756,7 @@ inherited frmTradePlanList: TfrmTradePlanList
     TabOrder = 6
     object TV3: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_3
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -756,12 +788,14 @@ inherited frmTradePlanList: TfrmTradePlanList
       object V2Column2: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #24037#33402
         DataBinding.FieldName = 'Technics'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -774,6 +808,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object V2Column3: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'FtyNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 82
@@ -781,6 +816,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object V2Column1: TcxGridDBColumn
         Caption = #21152#24037#21378
         DataBinding.FieldName = 'FtyName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -793,6 +829,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       object TV2Column5: TcxGridDBColumn
         Caption = #36319#21333#21592
         DataBinding.FieldName = 'FollowMan'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
diff --git a/G01贸易生产计划/U_TradePlanList.pas b/G01贸易生产计划/U_TradePlanList.pas
index bab04a0..354d266 100644
--- a/G01贸易生产计划/U_TradePlanList.pas
+++ b/G01贸易生产计划/U_TradePlanList.pas
@@ -14,8 +14,8 @@ uses
   cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
   IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd;
+  dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradePlanList = class(TfrmBaseList)
diff --git a/G01贸易生产计划/testDll.identcache b/G01贸易生产计划/testDll.identcache
index 3edb416..f89393c 100644
Binary files a/G01贸易生产计划/testDll.identcache and b/G01贸易生产计划/testDll.identcache differ
diff --git a/G02贸易汇总仓库/U_DataLink.pas b/G02贸易汇总仓库/U_DataLink.pas
index 0ad9f58..560927b 100644
--- a/G02贸易汇总仓库/U_DataLink.pas
+++ b/G02贸易汇总仓库/U_DataLink.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+    System.ImageList;
 
 type
   TMyThread = class(TThread)
diff --git a/G02贸易汇总仓库/U_TradeFinishClothInEdit.pas b/G02贸易汇总仓库/U_TradeFinishClothInEdit.pas
index 7e7f579..85eb653 100644
--- a/G02贸易汇总仓库/U_TradeFinishClothInEdit.pas
+++ b/G02贸易汇总仓库/U_TradeFinishClothInEdit.pas
@@ -9,8 +9,8 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseInput,
   System.ImageList, Vcl.ImgList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeFinishClothInList.pas b/G02贸易汇总仓库/U_TradeFinishClothInList.pas
index 8e9427d..2b061e3 100644
--- a/G02贸易汇总仓库/U_TradeFinishClothInList.pas
+++ b/G02贸易汇总仓库/U_TradeFinishClothInList.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeFinishClothOutEdit.pas b/G02贸易汇总仓库/U_TradeFinishClothOutEdit.pas
index 40a44a5..96beb57 100644
--- a/G02贸易汇总仓库/U_TradeFinishClothOutEdit.pas
+++ b/G02贸易汇总仓库/U_TradeFinishClothOutEdit.pas
@@ -9,8 +9,8 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit,
-  StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
+  StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, 
+   cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   U_BaseInput, System.ImageList, Vcl.ImgList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeFinishClothOutList.pas b/G02贸易汇总仓库/U_TradeFinishClothOutList.pas
index d6ef6b8..80665e1 100644
--- a/G02贸易汇总仓库/U_TradeFinishClothOutList.pas
+++ b/G02贸易汇总仓库/U_TradeFinishClothOutList.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeFinishClothStkList.pas b/G02贸易汇总仓库/U_TradeFinishClothStkList.pas
index f713155..41dc793 100644
--- a/G02贸易汇总仓库/U_TradeFinishClothStkList.pas
+++ b/G02贸易汇总仓库/U_TradeFinishClothStkList.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeFinishClothStkSel.pas b/G02贸易汇总仓库/U_TradeFinishClothStkSel.pas
index 56680ab..d3b7b95 100644
--- a/G02贸易汇总仓库/U_TradeFinishClothStkSel.pas
+++ b/G02贸易汇总仓库/U_TradeFinishClothStkSel.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList,
   Vcl.ImgList;
 
diff --git a/G02贸易汇总仓库/U_TradeGreyClothInEdit.pas b/G02贸易汇总仓库/U_TradeGreyClothInEdit.pas
index 8d36cbb..e8d1e95 100644
--- a/G02贸易汇总仓库/U_TradeGreyClothInEdit.pas
+++ b/G02贸易汇总仓库/U_TradeGreyClothInEdit.pas
@@ -9,8 +9,8 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseInput,
   System.ImageList, Vcl.ImgList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeGreyClothInList.pas b/G02贸易汇总仓库/U_TradeGreyClothInList.pas
index dc8ee66..b18b7b5 100644
--- a/G02贸易汇总仓库/U_TradeGreyClothInList.pas
+++ b/G02贸易汇总仓库/U_TradeGreyClothInList.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeGreyClothOutEdit.pas b/G02贸易汇总仓库/U_TradeGreyClothOutEdit.pas
index 645be56..575b7fb 100644
--- a/G02贸易汇总仓库/U_TradeGreyClothOutEdit.pas
+++ b/G02贸易汇总仓库/U_TradeGreyClothOutEdit.pas
@@ -9,8 +9,8 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit,
-  StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
-  dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
+  StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, 
+   cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   U_BaseInput, System.ImageList, Vcl.ImgList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeGreyClothOutList.pas b/G02贸易汇总仓库/U_TradeGreyClothOutList.pas
index 9b67f1d..0d679df 100644
--- a/G02贸易汇总仓库/U_TradeGreyClothOutList.pas
+++ b/G02贸易汇总仓库/U_TradeGreyClothOutList.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeGreyClothStkList.pas b/G02贸易汇总仓库/U_TradeGreyClothStkList.pas
index 82d2d0e..a0fe005 100644
--- a/G02贸易汇总仓库/U_TradeGreyClothStkList.pas
+++ b/G02贸易汇总仓库/U_TradeGreyClothStkList.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G02贸易汇总仓库/U_TradeGreyClothStkSel.pas b/G02贸易汇总仓库/U_TradeGreyClothStkSel.pas
index cd0cd1b..c18417f 100644
--- a/G02贸易汇总仓库/U_TradeGreyClothStkSel.pas
+++ b/G02贸易汇总仓库/U_TradeGreyClothStkSel.pas
@@ -11,7 +11,7 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList,
   Vcl.ImgList;
 
diff --git a/G03贸易布匹检验/U_DataLink.pas b/G03贸易布匹检验/U_DataLink.pas
index f028252..973ea7f 100644
--- a/G03贸易布匹检验/U_DataLink.pas
+++ b/G03贸易布匹检验/U_DataLink.pas
@@ -5,23 +5,23 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinWXI, dxSkinBasic,
-  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, dxSkinOffice2016Colorful,
-  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
-  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
-  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
-  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
-  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
-  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
-  dxSkinWhiteprint, dxSkinXmas2008Blue;
+    System.ImageList,  
+      
+    
+     
+     
+     
+    
+    
+    
+    
+    
+     
+     
+     
+    
+    
+   ;
 
 type
   TMyThread = class(TThread)
diff --git a/G03贸易布匹检验/U_TradeClothInspList.pas b/G03贸易布匹检验/U_TradeClothInspList.pas
index caabddc..07f73ce 100644
--- a/G03贸易布匹检验/U_TradeClothInspList.pas
+++ b/G03贸易布匹检验/U_TradeClothInspList.pas
@@ -12,9 +12,9 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
   cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic,
   RM_e_Jpeg, RM_e_txt, RM_e_csv, Math, Clipbrd, cxPC, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, dxDateTimeWheelPicker,
-  dxSkinWXI, dxScrollbarAnnotations;
+  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, 
+   dxDateRanges, U_BaseList, dxDateTimeWheelPicker,
+   dxScrollbarAnnotations;
 
 type
   TfrmTradeClothInspList = class(TfrmBaseList)
diff --git a/G03贸易布匹检验/U_TradeClothWaitPack.pas b/G03贸易布匹检验/U_TradeClothWaitPack.pas
index ea598bd..e2c1f20 100644
--- a/G03贸易布匹检验/U_TradeClothWaitPack.pas
+++ b/G03贸易布匹检验/U_TradeClothWaitPack.pas
@@ -9,7 +9,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters,
-  dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges,
+    cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, Vcl.ToolWin;
 
 type
diff --git a/G03贸易布匹检验/U_TradeInspEdit.pas b/G03贸易布匹检验/U_TradeInspEdit.pas
index 0865925..27f7c5d 100644
--- a/G03贸易布匹检验/U_TradeInspEdit.pas
+++ b/G03贸易布匹检验/U_TradeInspEdit.pas
@@ -8,8 +8,8 @@ uses
   cxEdit, DB, cxDBData, cxTextEdit, DBClient, ADODB, cxGridLevel,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls, ComCtrls, ToolWin,
-  cxButtonEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxSkinWXI, dxScrollbarAnnotations;
+  cxButtonEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges,  dxScrollbarAnnotations;
 
 type
   TfrmTradeInspEdit = class(TForm)
diff --git a/G03贸易布匹检验/U_TradeMachInsp.pas b/G03贸易布匹检验/U_TradeMachInsp.pas
index 0fdd7ad..bce616d 100644
--- a/G03贸易布匹检验/U_TradeMachInsp.pas
+++ b/G03贸易布匹检验/U_TradeMachInsp.pas
@@ -11,26 +11,26 @@ uses
   RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
   ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
   MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, Menus,
-  U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  U_BaseList,   dxDateRanges,
   dxBarBuiltInMenu, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent,
   IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, ShellAPI, IdFTP,
-  FireDAC.Stan.StorageXML, cxPC, dxSkinWXI, dxScrollbarAnnotations, dxSkinBasic,
-  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, dxSkinOffice2016Colorful,
-  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
-  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
-  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
-  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
-  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
-  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
-  dxSkinWhiteprint, dxSkinXmas2008Blue;
+  FireDAC.Stan.StorageXML, cxPC,  dxScrollbarAnnotations, 
+      
+    
+     
+     
+     
+    
+    
+    
+    
+    
+     
+     
+     
+    
+    
+   ;
 
 type
   TfrmTradeMachInsp = class(TfrmBaseList)
diff --git a/G03贸易布匹检验/U_TradePack.pas b/G03贸易布匹检验/U_TradePack.pas
index 1b44483..0109481 100644
--- a/G03贸易布匹检验/U_TradePack.pas
+++ b/G03贸易布匹检验/U_TradePack.pas
@@ -12,7 +12,7 @@ uses
   cxLookAndFeelPainters, cxButtons, RM_Common, RM_Class, RM_GridReport,
   RM_System, RM_Dataset, cxCheckBox, MMSystem, Math, WinSpool, Printers,
   cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxNavigator,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
+    dxDateRanges, dxBarBuiltInMenu,
   U_BaseList;
 
 type
diff --git a/G03贸易布匹检验/U_upPassword.pas b/G03贸易布匹检验/U_upPassword.pas
index dd0b0bb..0e3210c 100644
--- a/G03贸易布匹检验/U_upPassword.pas
+++ b/G03贸易布匹检验/U_upPassword.pas
@@ -5,7 +5,7 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, Menus, cxLookAndFeelPainters, cxButtons, DB, ADODB,
-  Buttons, ExtCtrls, cxGraphics, cxLookAndFeels, dxSkinsCore,
+  Buttons, ExtCtrls, cxGraphics, cxLookAndFeels, 
   dxSkinsDefaultPainters;
 
 type
diff --git a/G04贸易明细仓库/U_DataLink.pas b/G04贸易明细仓库/U_DataLink.pas
index 99d1cf0..0e8a036 100644
--- a/G04贸易明细仓库/U_DataLink.pas
+++ b/G04贸易明细仓库/U_DataLink.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+    System.ImageList;
 
 type
   TMyThread = class(TThread)
diff --git a/G04贸易明细仓库/U_TradeClothDROutEdit.pas b/G04贸易明细仓库/U_TradeClothDROutEdit.pas
index 14938df..25d2c8d 100644
--- a/G04贸易明细仓库/U_TradeClothDROutEdit.pas
+++ b/G04贸易明细仓库/U_TradeClothDROutEdit.pas
@@ -10,7 +10,7 @@ uses
   cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
   cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, BtnEdit, ShellAPI, cxTextEdit,
   RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, RM_e_Xls,
-  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeels, cxLookAndFeelPainters,  
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothInEdit.pas b/G04贸易明细仓库/U_TradeClothInEdit.pas
index 33372f9..e9729e4 100644
--- a/G04贸易明细仓库/U_TradeClothInEdit.pas
+++ b/G04贸易明细仓库/U_TradeClothInEdit.pas
@@ -9,8 +9,8 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, MMSystem,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, 
+   dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
   RM_GridReport, RM_Dataset, Vcl.ToolWin;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothInList.pas b/G04贸易明细仓库/U_TradeClothInList.pas
index 9102b03..326245e 100644
--- a/G04贸易明细仓库/U_TradeClothInList.pas
+++ b/G04贸易明细仓库/U_TradeClothInList.pas
@@ -11,8 +11,8 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
   System.StrUtils;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothOutEdit.pas b/G04贸易明细仓库/U_TradeClothOutEdit.pas
index d4ae8cf..92db3d0 100644
--- a/G04贸易明细仓库/U_TradeClothOutEdit.pas
+++ b/G04贸易明细仓库/U_TradeClothOutEdit.pas
@@ -9,8 +9,8 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, MMSystem,
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, 
+   dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
   RM_GridReport, RM_Dataset, Vcl.ToolWin;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothOutList.pas b/G04贸易明细仓库/U_TradeClothOutList.pas
index 2559f0d..11d3d2d 100644
--- a/G04贸易明细仓库/U_TradeClothOutList.pas
+++ b/G04贸易明细仓库/U_TradeClothOutList.pas
@@ -11,8 +11,8 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
   System.StrUtils;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothStkList.pas b/G04贸易明细仓库/U_TradeClothStkList.pas
index 2bf09ad..3138ef6 100644
--- a/G04贸易明细仓库/U_TradeClothStkList.pas
+++ b/G04贸易明细仓库/U_TradeClothStkList.pas
@@ -11,8 +11,8 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, 
+   dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
   System.StrUtils;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothWaitReleased.pas b/G04贸易明细仓库/U_TradeClothWaitReleased.pas
index b71430d..73e0a4f 100644
--- a/G04贸易明细仓库/U_TradeClothWaitReleased.pas
+++ b/G04贸易明细仓库/U_TradeClothWaitReleased.pas
@@ -9,7 +9,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCheckBox, Menus, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  cxNavigator,   dxDateRanges,
   dxBarBuiltInMenu, Vcl.ToolWin;
 
 type
diff --git a/G04贸易明细仓库/U_TradeClothWaitStorage.pas b/G04贸易明细仓库/U_TradeClothWaitStorage.pas
index b07938c..bbe8f8e 100644
--- a/G04贸易明细仓库/U_TradeClothWaitStorage.pas
+++ b/G04贸易明细仓库/U_TradeClothWaitStorage.pas
@@ -9,7 +9,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters,
-  dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges,
+    cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, Vcl.ToolWin;
 
 type
diff --git a/G04贸易明细仓库/U_TradeDeliveryRequest.pas b/G04贸易明细仓库/U_TradeDeliveryRequest.pas
index c2c1cc6..ad04e32 100644
--- a/G04贸易明细仓库/U_TradeDeliveryRequest.pas
+++ b/G04贸易明细仓库/U_TradeDeliveryRequest.pas
@@ -11,7 +11,7 @@ uses
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
   cxDropDownEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, U_BaseList,
+  dxBarBuiltInMenu,   U_BaseList,
   dxDateRanges;
 
 type
diff --git a/G04贸易明细仓库/U_TradeDeliveryRequestInPut.pas b/G04贸易明细仓库/U_TradeDeliveryRequestInPut.pas
index fc722d8..2e426e7 100644
--- a/G04贸易明细仓库/U_TradeDeliveryRequestInPut.pas
+++ b/G04贸易明细仓库/U_TradeDeliveryRequestInPut.pas
@@ -10,7 +10,7 @@ uses
   cxRichEdit, ComCtrls, cxContainer, cxTextEdit, cxMaskEdit, cxButtonEdit,
   StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
   cxDropDownEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters,
+  cxLookAndFeelPainters, cxNavigator,  
   dxDateRanges, dxBarBuiltInMenu, U_BaseList;
 
 type