diff --git a/复合检验管理/ProjectGroup1.bpg b/复合检验管理/ProjectGroup1.bpg
index 7c050f6..091c62d 100644
--- a/复合检验管理/ProjectGroup1.bpg
+++ b/复合检验管理/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 = TradeManage.dll testDll.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
+TradeManage.dll: TradeManage.dpr
+  $(DCC)
+
 testDll.exe: testDll.dpr
   $(DCC)
 
-ProductPrice.dll: ProductPrice.dpr
-  $(DCC)
-
 
diff --git a/复合检验管理/ProjectGroup1.~bpg b/复合检验管理/ProjectGroup1.~bpg
new file mode 100644
index 0000000..7c050f6
--- /dev/null
+++ b/复合检验管理/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/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm
index e6625e0..76f857e 100644
--- a/复合检验管理/U_MJManageNewFDNew.dfm
+++ b/复合检验管理/U_MJManageNewFDNew.dfm
@@ -47,7 +47,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 425
-    Height = 636
+    Height = 628
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -191,8 +191,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 1151
     Top = 87
-    Width = 209
-    Height = 636
+    Width = 201
+    Height = 628
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -1043,7 +1043,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 425
     Top = 87
     Width = 512
-    Height = 636
+    Height = 628
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2296,7 +2296,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 937
     Top = 87
     Width = 214
-    Height = 636
+    Height = 628
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2305,7 +2305,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 311
+      Height = 303
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2413,7 +2413,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 313
+      Top = 305
       Width = 210
       Height = 28
       Align = alBottom
@@ -2428,7 +2428,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 341
+      Top = 333
       Width = 210
       Height = 293
       Align = alBottom
@@ -2641,7 +2641,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1360
+    Width = 1352
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2814,7 +2814,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1360
+    Width = 1352
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index 0a3a31d..cfeaffd 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -807,7 +807,7 @@ begin
   InitJP();
   with ADOTmp do
   begin
-    Close;
+    Close;                  
     sql.Clear;
     sql.Add('select BanZu from SY_User where UserId=''' + Trim(DCode) + '''');
     Open;
@@ -822,10 +822,10 @@ begin
       OpenCom(DllName);
     if trim(JCYDLL) <> '' then
       OpenCom(JCYDLL);
-//    if trim(DllNameT) <> '' then
-//      OpenCom1(DllNameT);
-//    if trim(JCYDLLT) <> '' then
-//      OpenCom(JCYDLLT);
+    if trim(DllNameT) <> '' then
+      OpenCom1(DllNameT);
+    if trim(JCYDLLT) <> '' then
+      OpenCom(JCYDLLT);
     Edit7.Visible := true;
     Label35.Visible := true;
     Edit9.Visible := true;
diff --git a/复合检验管理/testDll.cfg b/复合检验管理/testDll.cfg
index 6c57635..e9c1cc1 100644
--- a/复合检验管理/testDll.cfg
+++ b/复合检验管理/testDll.cfg
@@ -31,8 +31,8 @@
 -M
 -$M16384,1048576
 -K$00400000
--LE"c:\program files\borland\delphi7\Projects\Bpl"
--LN"c:\program files\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST
diff --git a/复合检验管理/testDll.dof b/复合检验管理/testDll.dof
index f452c6e..a20e6d3 100644
--- a/复合检验管理/testDll.dof
+++ b/复合检验管理/testDll.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\selfware_83398\selfware\�����ֿ�������\��Ŀ����\self\·չó�׹���\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJjinchao\���ϼ������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/复合检验管理/testDll.skincfg b/复合检验管理/testDll.skincfg
new file mode 100644
index 0000000..89edbfe
--- /dev/null
+++ b/复合检验管理/testDll.skincfg
@@ -0,0 +1,50 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=1
+dxSkinBlack=1
+dxSkinBlue=1
+dxSkinBlueprint=1
+dxSkinCaramel=1
+dxSkinCoffee=1
+dxSkinDarkRoom=1
+dxSkinDarkSide=1
+dxSkinDevExpressDarkStyle=1
+dxSkinDevExpressStyle=1
+dxSkinFoggy=1
+dxSkinGlassOceans=1
+dxSkinHighContrast=1
+dxSkiniMaginary=1
+dxSkinLilian=1
+dxSkinLiquidSky=1
+dxSkinLondonLiquidSky=1
+dxSkinMcSkin=1
+dxSkinMetropolis=1
+dxSkinMetropolisDark=1
+dxSkinMoneyTwins=1
+dxSkinOffice2007Black=1
+dxSkinOffice2007Blue=1
+dxSkinOffice2007Green=1
+dxSkinOffice2007Pink=1
+dxSkinOffice2007Silver=1
+dxSkinOffice2010Black=1
+dxSkinOffice2010Blue=1
+dxSkinOffice2010Silver=1
+dxSkinOffice2013DarkGray=1
+dxSkinOffice2013LightGray=1
+dxSkinOffice2013White=1
+dxSkinPumpkin=1
+dxSkinSeven=1
+dxSkinSevenClassic=1
+dxSkinSharp=1
+dxSkinSharpPlus=1
+dxSkinSilver=1
+dxSkinSpringTime=1
+dxSkinStardust=1
+dxSkinSummer2008=1
+dxSkinTheAsphaltWorld=1
+dxSkinsDefaultPainters=1
+dxSkinValentine=1
+dxSkinVS2010=1
+dxSkinWhiteprint=1
+dxSkinXmas2008Blue=1