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..040a2a8
--- /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 = TradeManage.dll testDll.exe
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+TradeManage.dll: ..\..\D7DJshunyang\����������\TradeManage.dpr
+  $(DCC)
+
+testDll.exe: ..\..\D7DJshunyang\����������\testDll.dpr
+  $(DCC)
+
+
diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index e0b0e5f..c67f06a 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -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/检验管理/U_DataLink.dfm b/检验管理/U_DataLink.dfm
index 6ccac41..bdf1ead 100644
--- a/检验管理/U_DataLink.dfm
+++ b/检验管理/U_DataLink.dfm
@@ -2,8 +2,8 @@ object DataLink_TradeManage: TDataLink_TradeManage
   OldCreateOrder = False
   OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
-  Left = 277
-  Top = 210
+  Left = 279
+  Top = 211
   Height = 349
   Width = 482
   object AdoDataLink: TADOQuery
diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 376b592..71f5964 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 481
-  Top = 228
+  Left = 595
+  Top = 385
   Width = 1382
   Height = 754
   Caption = #26816#39564#25253#21578
@@ -21,7 +21,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1366
+    Width = 1374
     Height = 62
     AutoSize = True
     ButtonHeight = 30
@@ -188,7 +188,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object ComboBox1: TComboBox
       Left = 535
-      Top = 33
+      Top = 30
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -198,10 +198,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Font.Name = #23435#20307
       Font.Style = []
       ItemHeight = 16
-      ItemIndex = 0
       ParentFont = False
       TabOrder = 0
-      Text = #26816#39564#30721#21333
       OnChange = ComboBox1Change
       Items.Strings = (
         #26816#39564#30721#21333
@@ -212,6 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #28151#33394#21253#30721#21333
         #28151#33394#21253#30721#21333'2'
         #22825#28193#30721#21333
+        #28151#33394#21253#30721#21333#20004#20301
+        ''
         '')
     end
     object ToolButton9: TToolButton
@@ -242,7 +242,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object Panel1: TPanel
     Left = 0
     Top = 62
-    Width = 1366
+    Width = 1374
     Height = 88
     Align = alTop
     BevelInner = bvRaised
@@ -763,8 +763,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   object cxGrid1: TcxGrid
     Left = 0
     Top = 150
-    Width = 1366
-    Height = 565
+    Width = 1374
+    Height = 573
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index 7a5a4ca..30a3cb7 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -542,6 +542,7 @@ begin
     TBPZ.Visible := false;
 //    TCPDB.Visible:=False;
   end;
+  ComboBox1.ItemIndex:=0;
 end;
 
 procedure TfrmJYOrderCDOne.Panel10MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
@@ -1554,6 +1555,32 @@ begin
     end;
   end;
 
+    if (trim(ComboBox1.Text) = '��ɫ���뵥��λ') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_HSDB ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;
+    end;
+  end;
+
   if (trim(ComboBox1.Text) = '��ɫ���뵥2') then
   begin
     with ADOQueryTemp do
diff --git a/检验管理/U_testdll.dfm b/检验管理/U_testdll.dfm
index b1d8f4c..f76c67b 100644
--- a/检验管理/U_testdll.dfm
+++ b/检验管理/U_testdll.dfm
@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 153
-  Top = 124
+  Left = 155
+  Top = 125
   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