diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index e969239..7c01892 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\֣��ƽ��������\��Ŀ����\׿��\�������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7djZhuoyan\�������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/检验管理/U_ClothHCList.dfm b/检验管理/U_ClothHCList.dfm
index 38b6eb1..d8ae5e9 100644
--- a/检验管理/U_ClothHCList.dfm
+++ b/检验管理/U_ClothHCList.dfm
@@ -20,7 +20,7 @@ object frmClothHCList: TfrmClothHCList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1163
+    Width = 1171
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 59
@@ -66,7 +66,7 @@ object frmClothHCList: TfrmClothHCList
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1163
+    Width = 1171
     Height = 73
     Align = alTop
     BevelInner = bvRaised
@@ -289,13 +289,13 @@ object frmClothHCList: TfrmClothHCList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 105
-    Width = 1163
-    Height = 562
+    Width = 1171
+    Height = 569
     Align = alClient
     TabOrder = 2
     object TV2: TcxGridDBTableView
       OnDblClick = TV2DblClick
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <
diff --git a/检验管理/U_ClothHCList.pas b/检验管理/U_ClothHCList.pas
index 0379a01..96063f4 100644
--- a/检验管理/U_ClothHCList.pas
+++ b/检验管理/U_ClothHCList.pas
@@ -10,7 +10,22 @@ uses
   cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter,
   RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport,
-  cxTextEdit, cxDropDownEdit, cxCheckBox;
+  cxTextEdit, cxDropDownEdit, cxCheckBox, cxLookAndFeels,
+  cxLookAndFeelPainters, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle,
+  dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  cxNavigator;
 
 type
   TfrmClothHCList = class(TForm)
diff --git a/检验管理/U_GetDllForm.pas b/检验管理/U_GetDllForm.pas
index a0efc78..00bc5e7 100644
--- a/检验管理/U_GetDllForm.pas
+++ b/检验管理/U_GetDllForm.pas
@@ -76,8 +76,8 @@ begin
   user := 'sa';
   pswd := 'rightsoft@123';
   DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-  DConString := DataBaseStr;
-//   DParameters1:='��Ȩ��';
+//  DConString := DataBaseStr;
+   DParameters1:='��Ȩ��';
    //DCode:='ADMIN';
    //DName:='ADMIN';
 //   DParameters2:='��Ʒ����'; //12
diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm
index 5091232..19b3728 100644
--- a/检验管理/U_MJManageNewFDNew.dfm
+++ b/检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 195
-  Top = 125
+  Left = 486
+  Top = 172
   Width = 1421
   Height = 894
   Caption = #25104#21697#26816#39564
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index fc63b6a..bc7cee0 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -379,10 +379,10 @@ begin
     if (trim(Edit7.Text) = '��') then
     begin
       MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
-      if i2 = 0 then
-        Label9.Caption := 'M'
-      else
-        Label9.Caption := 'Y';
+//      if i2 = 0 then
+//        Label9.Caption := 'M'
+//      else
+//        Label9.Caption := 'Y';
       edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
     end;
   end;