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/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index 5db2fd1..b4fa62b 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\��ȫ\�������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJjinquan\�������\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..554ddb0
--- /dev/null
+++ b/检验管理/TradeManage.skincfg
@@ -0,0 +1,50 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=0
+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
diff --git a/检验管理/U_GetDllForm.pas b/检验管理/U_GetDllForm.pas
index 665a906..a0ca28f 100644
--- a/检验管理/U_GetDllForm.pas
+++ b/检验管理/U_GetDllForm.pas
@@ -84,7 +84,7 @@ begin
    //DCode:='ADMIN';
    //DName:='ADMIN';
 //  DParameters2:='��Ʒ����'; //12
-//   DParameters2:='����';
+   DParameters2:='����';
 //  DParameters2 := '��ѯ';
   if not ConnData() then
   begin
diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 295422b..0337c54 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 352
-  Top = 248
+  Left = 415
+  Top = 642
   Width = 1400
   Height = 757
   Caption = #26816#39564#25253#21578
@@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1384
+    Width = 1392
     Height = 62
     AutoSize = True
     ButtonHeight = 30
@@ -270,7 +270,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object Panel1: TPanel
     Left = 0
     Top = 62
-    Width = 1384
+    Width = 1392
     Height = 88
     Align = alTop
     BevelInner = bvRaised
@@ -785,8 +785,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object cxGrid1: TcxGrid
     Left = 0
     Top = 150
-    Width = 1384
-    Height = 568
+    Width = 1392
+    Height = 576
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -1085,6 +1085,12 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         HeaderAlignmentHorz = taCenter
         Width = 65
       end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #25104#20998
+        DataBinding.FieldName = 'ChengFen'
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index f7cc061..d7f4693 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -197,6 +197,7 @@ type
     ComboBox2: TComboBox;
     Button8: TButton;
     Button10: TButton;
+    Tv1Column2: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -376,7 +377,7 @@ begin
       begin
         sql.add('and mjtype=''��Ʒ'' ');
       end;
-      sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
+      sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh ');
       Open;
     end;
     SCreateCDS20(ADOQueryMain, Order_Main);
@@ -440,7 +441,7 @@ begin
   EndDate.DateTime := SGetServerDate10(ADOQueryTemp);
   InitGrid();
   ComboBox1.ItemIndex := 0;
-end;                                               
+end;
 
 procedure TfrmJYOrderCDOne.TBFindClick(Sender: TObject);
 var