diff --git a/应收应付(YSYF.dll)/U_DataLink.pas b/应收应付(YSYF.dll)/U_DataLink.pas
index e34ca22..9451ec9 100644
--- a/应收应付(YSYF.dll)/U_DataLink.pas
+++ b/应收应付(YSYF.dll)/U_DataLink.pas
@@ -4,7 +4,8 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses;
+  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, dxSkinsCore,
+  dxSkinsDefaultPainters;
 var
    DConString:String;   {ȫ�������ַ���}
    server, dtbase, user, pswd: String;  {���ݿ����Ӳ���}
diff --git a/应收应付(YSYF.dll)/U_GetDllForm.pas b/应收应付(YSYF.dll)/U_GetDllForm.pas
index fcdd8a1..ddf9906 100644
--- a/应收应付(YSYF.dll)/U_GetDllForm.pas
+++ b/应收应付(YSYF.dll)/U_GetDllForm.pas
@@ -85,13 +85,13 @@ begin
 //   DParameters1:='����';//103
 //   DParameters2:='�����';
 //   DParameters1:='��Ȩ��';
-//   DParameters1:='��Ȩ��';
+   DParameters1:='��Ȩ��';
 //   Parameters1:='��Ȩ��';
 //   DataBase:='��Ȩ��';
 //   DataBase:='1';
 //   DParameters1:='0';
-//   DParameters3:='��Ŀ�ֿ�';
-//   DParameters4:='�Է���λ�ֿ�';
+   DParameters3:='��Ŀ�ֿ�';
+   DParameters4:='�Է���λ�ֿ�';
 //   DParameters5:='��Ʊ';
 //   DParameters6:='����'; //Ӧ����
 //   DParameters7:='ƥ��'; //Ӧ�տ�
diff --git a/应收应付(YSYF.dll)/U_YSCR.dfm b/应收应付(YSYF.dll)/U_YSCR.dfm
index 74f438b..1dc4063 100644
--- a/应收应付(YSYF.dll)/U_YSCR.dfm
+++ b/应收应付(YSYF.dll)/U_YSCR.dfm
@@ -1,6 +1,6 @@
 object frmYSCR: TfrmYSCR
-  Left = 408
-  Top = 234
+  Left = 150
+  Top = 395
   Width = 1334
   Height = 580
   Caption = #24212#25910#27454#31649#29702
@@ -20,7 +20,7 @@ object frmYSCR: TfrmYSCR
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1318
+    Width = 1326
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 83
@@ -117,7 +117,7 @@ object frmYSCR: TfrmYSCR
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1318
+    Width = 1326
     Height = 74
     Align = alTop
     BevelInner = bvRaised
@@ -295,8 +295,8 @@ object frmYSCR: TfrmYSCR
   object cxGrid2: TcxGrid
     Left = 0
     Top = 127
-    Width = 1318
-    Height = 414
+    Width = 1326
+    Height = 422
     Align = alClient
     TabOrder = 2
     object Tv2: TcxGridDBTableView
@@ -519,7 +519,7 @@ object frmYSCR: TfrmYSCR
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 105
-    Width = 1318
+    Width = 1326
     Height = 22
     Align = alTop
     TabOrder = 3
@@ -532,7 +532,7 @@ object frmYSCR: TfrmYSCR
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1318
+    ClientRectRight = 1326
     ClientRectTop = 19
   end
   object Panel9: TPanel
diff --git a/应收应付(YSYF.dll)/U_YSCR.pas b/应收应付(YSYF.dll)/U_YSCR.pas
index 09f262f..313ae36 100644
--- a/应收应付(YSYF.dll)/U_YSCR.pas
+++ b/应收应付(YSYF.dll)/U_YSCR.pas
@@ -13,7 +13,8 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxBarBuiltInMenu, cxContainer, cxCurrencyEdit;
+  dxBarBuiltInMenu, cxContainer, cxCurrencyEdit, dxSkinsCore,
+  dxSkinsDefaultPainters, dxSkinscxPCPainter;
 
 type
   TfrmYSCR = class(TForm)
diff --git a/应收应付(YSYF.dll)/U_YSMXlist.dfm b/应收应付(YSYF.dll)/U_YSMXlist.dfm
index 199f4f1..6d0467e 100644
--- a/应收应付(YSYF.dll)/U_YSMXlist.dfm
+++ b/应收应付(YSYF.dll)/U_YSMXlist.dfm
@@ -1,6 +1,6 @@
 object frmYSMXlist: TfrmYSMXlist
-  Left = 349
-  Top = 383
+  Left = 173
+  Top = 272
   Width = 1341
   Height = 559
   Caption = #24212#25910#23545#36134#20449#24687#34920
@@ -21,7 +21,7 @@ object frmYSMXlist: TfrmYSMXlist
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1325
+    Width = 1333
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 59
@@ -78,7 +78,7 @@ object frmYSMXlist: TfrmYSMXlist
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1325
+    Width = 1333
     Height = 38
     Align = alTop
     BevelInner = bvRaised
@@ -198,7 +198,7 @@ object frmYSMXlist: TfrmYSMXlist
   object cxGrid2: TcxGrid
     Left = 0
     Top = 69
-    Width = 1325
+    Width = 1333
     Height = 444
     Align = alTop
     TabOrder = 2
@@ -302,12 +302,12 @@ object frmYSMXlist: TfrmYSMXlist
         Position.RowIndex = 0
       end
       object V1Column7: TcxGridDBBandedColumn
-        Caption = #25968#37327
+        Caption = #24635#31859#25968
         DataBinding.FieldName = 'Qty'
         HeaderAlignmentHorz = taCenter
         Width = 60
         Position.BandIndex = 1
-        Position.ColIndex = 5
+        Position.ColIndex = 6
         Position.RowIndex = 0
       end
       object V1Column8: TcxGridDBBandedColumn
@@ -316,7 +316,7 @@ object frmYSMXlist: TfrmYSMXlist
         HeaderAlignmentHorz = taCenter
         Width = 60
         Position.BandIndex = 1
-        Position.ColIndex = 6
+        Position.ColIndex = 7
         Position.RowIndex = 0
       end
       object V1Column9: TcxGridDBBandedColumn
@@ -325,7 +325,7 @@ object frmYSMXlist: TfrmYSMXlist
         HeaderAlignmentHorz = taCenter
         Width = 60
         Position.BandIndex = 1
-        Position.ColIndex = 7
+        Position.ColIndex = 8
         Position.RowIndex = 0
       end
       object V1Column10: TcxGridDBBandedColumn
@@ -400,6 +400,17 @@ object frmYSMXlist: TfrmYSMXlist
         Position.ColIndex = 4
         Position.RowIndex = 0
       end
+      object TV1Column3: TcxGridDBBandedColumn
+        Caption = #23454#38469#31859#25968
+        DataBinding.FieldName = 'SJQty'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = ',0.00;-,0.00'
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+        Position.BandIndex = 1
+        Position.ColIndex = 5
+        Position.RowIndex = 0
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = TV1
diff --git a/应收应付(YSYF.dll)/U_YSMXlist.pas b/应收应付(YSYF.dll)/U_YSMXlist.pas
index caf4219..b2a3588 100644
--- a/应收应付(YSYF.dll)/U_YSMXlist.pas
+++ b/应收应付(YSYF.dll)/U_YSMXlist.pas
@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP,ShellAPI,IniFiles, cxCheckBox, cxCalendar,
   cxButtonEdit, cxTextEdit, cxDropDownEdit, RM_e_Xls,
   cxGridBandedTableView, cxGridDBBandedTableView, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator;
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinscxPCPainter, cxCurrencyEdit;
 
 type
   TfrmYSMXlist = class(TForm)
@@ -68,6 +69,7 @@ type
     V1Column15: TcxGridDBBandedColumn;
     V1Column23: TcxGridDBBandedColumn;
     TV1Column1: TcxGridDBBandedColumn;
+    TV1Column3: TcxGridDBBandedColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
diff --git a/应收应付(YSYF.dll)/U_YSSCList.dfm b/应收应付(YSYF.dll)/U_YSSCList.dfm
index db1b234..255315d 100644
--- a/应收应付(YSYF.dll)/U_YSSCList.dfm
+++ b/应收应付(YSYF.dll)/U_YSSCList.dfm
@@ -1,6 +1,6 @@
 object frmYSSCList: TfrmYSSCList
-  Left = 363
-  Top = 424
+  Left = 195
+  Top = 230
   Width = 1160
   Height = 590
   Caption = #24212#25910#27454#29983#25104#20449#24687#21015#34920
@@ -21,7 +21,7 @@ object frmYSSCList: TfrmYSSCList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1144
+    Width = 1152
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 59
@@ -83,7 +83,7 @@ object frmYSSCList: TfrmYSSCList
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1144
+    Width = 1152
     Height = 64
     Align = alTop
     BevelInner = bvRaised
@@ -227,8 +227,8 @@ object frmYSSCList: TfrmYSSCList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 117
-    Width = 1144
-    Height = 434
+    Width = 1152
+    Height = 442
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
@@ -377,7 +377,7 @@ object frmYSSCList: TfrmYSSCList
       end
       object v2Column6: TcxGridDBColumn
         Tag = 2
-        Caption = #25968#37327
+        Caption = #24635#31859#25968
         DataBinding.FieldName = 'Qty'
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
@@ -398,6 +398,12 @@ object frmYSSCList: TfrmYSSCList
         Options.Editing = False
         Width = 66
       end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #23454#38469#31859#25968
+        DataBinding.FieldName = 'SJQty'
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
@@ -406,7 +412,7 @@ object frmYSSCList: TfrmYSSCList
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 97
-    Width = 1144
+    Width = 1152
     Height = 20
     Align = alTop
     Font.Charset = GB2312_CHARSET
diff --git a/应收应付(YSYF.dll)/U_YSSCList.pas b/应收应付(YSYF.dll)/U_YSSCList.pas
index 7218f13..796a325 100644
--- a/应收应付(YSYF.dll)/U_YSSCList.pas
+++ b/应收应付(YSYF.dll)/U_YSSCList.pas
@@ -11,7 +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, cxButtonEdit, cxTextEdit, cxPC,
-  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu;
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter;
 
 type
   TfrmYSSCList = class(TForm)
@@ -64,6 +65,7 @@ type
     v1Column11: TcxGridDBColumn;
     v1Column20: TcxGridDBColumn;
     CRType: TEdit;
+    Tv1Column1: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
diff --git a/应收应付(YSYF.dll)/U_testdll.dfm b/应收应付(YSYF.dll)/U_testdll.dfm
index 5cee148..84b8075 100644
--- a/应收应付(YSYF.dll)/U_testdll.dfm
+++ b/应收应付(YSYF.dll)/U_testdll.dfm
@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 153
-  Top = 124
+  Left = 256
+  Top = 558
   Width = 791
   Height = 554
   Caption = 'Form1'
@@ -21,7 +21,7 @@ object Form1: TForm1
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 775
+    Width = 783
     Height = 25
     ButtonWidth = 57
     Caption = 'ToolBar1'
diff --git a/应收应付(YSYF.dll)/YSYF.dof b/应收应付(YSYF.dll)/YSYF.dof
index d1c050a..d442026 100644
--- a/应收应付(YSYF.dll)/YSYF.dof
+++ b/应收应付(YSYF.dll)/YSYF.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\ʢ�˸���\Ӧ��Ӧ��(YSYF.dll)\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJfhshengxing\Ӧ��Ӧ��(YSYF.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/应收应付(YSYF.dll)/testDll.cfg b/应收应付(YSYF.dll)/testDll.cfg
index 0ee74bb..e9c1cc1 100644
--- a/应收应付(YSYF.dll)/testDll.cfg
+++ b/应收应付(YSYF.dll)/testDll.cfg
@@ -31,8 +31,8 @@
 -M
 -$M16384,1048576
 -K$00400000
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\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/应收应付(YSYF.dll)/testDll.skincfg b/应收应付(YSYF.dll)/testDll.skincfg
new file mode 100644
index 0000000..0bd3d07
--- /dev/null
+++ b/应收应付(YSYF.dll)/testDll.skincfg
@@ -0,0 +1,50 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=1
+dxSkinBlack=0
+dxSkinBlue=0
+dxSkinBlueprint=0
+dxSkinCaramel=0
+dxSkinCoffee=0
+dxSkinDarkRoom=0
+dxSkinDarkSide=0
+dxSkinDevExpressDarkStyle=0
+dxSkinDevExpressStyle=0
+dxSkinFoggy=0
+dxSkinGlassOceans=0
+dxSkinHighContrast=0
+dxSkiniMaginary=0
+dxSkinLilian=0
+dxSkinLiquidSky=0
+dxSkinLondonLiquidSky=0
+dxSkinMcSkin=0
+dxSkinMetropolis=0
+dxSkinMetropolisDark=0
+dxSkinMoneyTwins=0
+dxSkinOffice2007Black=0
+dxSkinOffice2007Blue=0
+dxSkinOffice2007Green=0
+dxSkinOffice2007Pink=0
+dxSkinOffice2007Silver=0
+dxSkinOffice2010Black=0
+dxSkinOffice2010Blue=0
+dxSkinOffice2010Silver=0
+dxSkinOffice2013DarkGray=0
+dxSkinOffice2013LightGray=0
+dxSkinOffice2013White=0
+dxSkinPumpkin=0
+dxSkinSeven=0
+dxSkinSevenClassic=0
+dxSkinSharp=0
+dxSkinSharpPlus=0
+dxSkinSilver=0
+dxSkinSpringTime=0
+dxSkinStardust=0
+dxSkinSummer2008=0
+dxSkinTheAsphaltWorld=0
+dxSkinsDefaultPainters=1
+dxSkinValentine=0
+dxSkinVS2010=0
+dxSkinWhiteprint=0
+dxSkinXmas2008Blue=0
diff --git a/检验管理/ProjectGroup1.bpg b/检验管理/ProjectGroup1.bpg
index 7c050f6..c07b0ac 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)
 #------------------------------------------------------------------------------
 
-testDll.exe: testDll.dpr
+TradeManage.dll: ..\..\D7DJqianjing\�������\TradeManage.dpr
   $(DCC)
 
-ProductPrice.dll: ProductPrice.dpr
+testDll.exe: ..\..\D7DJqianjing\�������\testDll.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/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index 9db82c7..5f3730a 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\ʢ�˸���\�������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJfhshengxing\�������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
@@ -136,6 +136,3 @@ ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/检验管理/TradeManage.skincfg b/检验管理/TradeManage.skincfg
new file mode 100644
index 0000000..0bd3d07
--- /dev/null
+++ b/检验管理/TradeManage.skincfg
@@ -0,0 +1,50 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=1
+dxSkinBlack=0
+dxSkinBlue=0
+dxSkinBlueprint=0
+dxSkinCaramel=0
+dxSkinCoffee=0
+dxSkinDarkRoom=0
+dxSkinDarkSide=0
+dxSkinDevExpressDarkStyle=0
+dxSkinDevExpressStyle=0
+dxSkinFoggy=0
+dxSkinGlassOceans=0
+dxSkinHighContrast=0
+dxSkiniMaginary=0
+dxSkinLilian=0
+dxSkinLiquidSky=0
+dxSkinLondonLiquidSky=0
+dxSkinMcSkin=0
+dxSkinMetropolis=0
+dxSkinMetropolisDark=0
+dxSkinMoneyTwins=0
+dxSkinOffice2007Black=0
+dxSkinOffice2007Blue=0
+dxSkinOffice2007Green=0
+dxSkinOffice2007Pink=0
+dxSkinOffice2007Silver=0
+dxSkinOffice2010Black=0
+dxSkinOffice2010Blue=0
+dxSkinOffice2010Silver=0
+dxSkinOffice2013DarkGray=0
+dxSkinOffice2013LightGray=0
+dxSkinOffice2013White=0
+dxSkinPumpkin=0
+dxSkinSeven=0
+dxSkinSevenClassic=0
+dxSkinSharp=0
+dxSkinSharpPlus=0
+dxSkinSilver=0
+dxSkinSpringTime=0
+dxSkinStardust=0
+dxSkinSummer2008=0
+dxSkinTheAsphaltWorld=0
+dxSkinsDefaultPainters=1
+dxSkinValentine=0
+dxSkinVS2010=0
+dxSkinWhiteprint=0
+dxSkinXmas2008Blue=0
diff --git a/检验管理/U_DataLink.pas b/检验管理/U_DataLink.pas
index 54c5229..2ea2d07 100644
--- a/检验管理/U_DataLink.pas
+++ b/检验管理/U_DataLink.pas
@@ -4,7 +4,8 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses;
+  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, dxSkinsCore,
+  dxSkinsDefaultPainters;
 var
    DConString:String;   {ȫ�������ַ���}
    server, dtbase, user, pswd: String;  {���ݿ����Ӳ���}
diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm
index c827816..a1f8148 100644
--- a/检验管理/U_MJManageNewFDNew.dfm
+++ b/检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 322
-  Top = 165
+  Left = 191
+  Top = 151
   Width = 1366
   Height = 754
   Caption = #25104#21697#26816#39564
@@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 214
-    Height = 628
+    Height = 636
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -125,8 +125,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 633
     Top = 87
-    Width = 717
-    Height = 628
+    Width = 725
+    Height = 636
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -977,7 +977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 428
     Top = 87
     Width = 205
-    Height = 628
+    Height = 636
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1969,7 +1969,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 214
     Top = 87
     Width = 214
-    Height = 628
+    Height = 636
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1978,7 +1978,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 303
+      Height = 311
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2086,7 +2086,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 305
+      Top = 313
       Width = 210
       Height = 28
       Align = alBottom
@@ -2101,7 +2101,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 333
+      Top = 341
       Width = 210
       Height = 293
       Align = alBottom
@@ -2328,7 +2328,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1350
+    Width = 1358
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2516,7 +2516,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1350
+    Width = 1358
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index f2b39a6..e4be833 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -11,7 +11,8 @@ uses
   RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
   ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
   DateUtils, MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  ShellAPI, XMLDoc, XMLIntf;
+  ShellAPI, XMLDoc, XMLIntf, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinscxPCPainter;
 
 type
   TfrmMJManageNewFDNewSF = class(TForm)
@@ -525,6 +526,10 @@ begin
         sql.Add(' inner join JYOrder_Sub B on A.SubId=B.SubId where');
         SQL.Add(' B.subid=YF_Money_CR.YFTypeId   ');
         SQL.Add(' )');
+        sql.add(',sjQty=(select isnull(sum(A.sjcd),0) from WFB_MJJY A  ');
+        sql.Add(' inner join JYOrder_Sub B on A.SubId=B.SubId where');
+        SQL.Add(' B.subid=YF_Money_CR.YFTypeId   ');
+        SQL.Add(' )');
         sql.Add(',PS=(select isnull(count(*),0) from WFB_MJJY A  ');
         sql.Add(' inner join JYOrder_Sub B on A.SubId=B.SubId where');
         SQL.Add(' B.subid=YF_Money_CR.YFTypeId   ');
@@ -538,7 +543,7 @@ begin
           sql.Add(',money=isnull((''' + Trim(Yprtprice) + '''),0)*(select isnull(sum(A.mjQty4),0) from WFB_MJJY A   inner join JYOrder_Sub B on A.mainid=B.mainid where  A.subid=YF_Money_CR.YFTypeId  )');
         end;
         sql.Add(' where YFTypeId=''' + Trim(ysubid) + '''');
-//        showmessage(sql.text);
+        //showmessage(sql.text);
         ExecSQL;
       end;
       with ADOTmp do
diff --git a/检验管理/U_testdll.dfm b/检验管理/U_testdll.dfm
index b1d8f4c..9b8a616 100644
--- a/检验管理/U_testdll.dfm
+++ b/检验管理/U_testdll.dfm
@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 153
-  Top = 124
+  Left = 197
+  Top = 389
   Width = 791
   Height = 554
   Caption = 'Form1'
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..8dd1c51 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\��Ŀ����\D7DJfhshengxing\�������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=