diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm
index 30e8d26..65f7aab 100644
--- a/复合检验管理/U_JYOrderCDOne.dfm
+++ b/复合检验管理/U_JYOrderCDOne.dfm
@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1384
-    Height = 122
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 161
@@ -95,60 +95,59 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #25764#38144#20986#24211
       ImageIndex = 86
-      Wrap = True
       OnClick = ToolButton7Click
     end
     object ToolButton15: TToolButton
-      Left = 0
-      Top = 30
+      Left = 489
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#23458#25143#21697#21517#39068#33394' '
       ImageIndex = 57
       OnClick = ToolButton15Click
     end
     object ToolButton16: TToolButton
-      Left = 165
-      Top = 30
+      Left = 654
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#21333#20215
       ImageIndex = 54
       OnClick = ToolButton16Click
     end
     object ToolButton17: TToolButton
-      Left = 276
-      Top = 30
+      Left = 765
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#32440#31649#34955#23376#21333#20215
       ImageIndex = 56
       OnClick = ToolButton17Click
     end
     object ToolButton11: TToolButton
-      Left = 435
-      Top = 30
+      Left = 924
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 546
-      Top = 30
+      Left = 1035
+      Top = 0
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 657
-      Top = 30
+      Left = 1146
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 768
-      Top = 30
+      Left = 1257
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -158,7 +157,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object ToolButton8: TToolButton
       Left = 0
-      Top = 60
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
@@ -166,7 +165,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object ToolButton14: TToolButton
       Left = 111
-      Top = 60
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#31995#25968
       ImageIndex = 54
@@ -174,7 +173,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object ToolButton1: TToolButton
       Left = 222
-      Top = 60
+      Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
       ImageIndex = 96
@@ -182,7 +181,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object TCPDB: TToolButton
       Left = 309
-      Top = 60
+      Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
       ImageIndex = 57
@@ -191,7 +190,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object ToolButton3: TToolButton
       Left = 396
-      Top = 60
+      Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
       ImageIndex = 12
@@ -200,17 +199,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
     object ToolButton2: TToolButton
       Left = 495
-      Top = 60
+      Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
-      Wrap = True
       Visible = False
       OnClick = ToolButton2Click
     end
     object Edit3: TEdit
-      Left = 0
-      Top = 90
+      Left = 606
+      Top = 30
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -224,8 +222,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 68
-      Top = 93
+      Left = 674
+      Top = 33
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -249,16 +247,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object ToolButton5: TToolButton
-      Left = 217
-      Top = 90
+      Left = 823
+      Top = 30
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit4: TEdit
-      Left = 280
-      Top = 90
+      Left = 886
+      Top = 30
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -271,8 +269,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 401
-      Top = 90
+      Left = 1007
+      Top = 30
       AutoSize = True
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
@@ -280,24 +278,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 488
-      Top = 90
+      Left = 1094
+      Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 575
-      Top = 90
+      Left = 1181
+      Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 638
-      Top = 90
+      Left = 1244
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -306,7 +304,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 122
+    Top = 62
     Width = 1384
     Height = 88
     Align = alTop
@@ -873,9 +871,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 233
+    Top = 173
     Width = 1384
-    Height = 485
+    Height = 545
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -2100,7 +2098,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxTabControl1: TcxTabControl
     Left = 0
-    Top = 210
+    Top = 150
     Width = 1384
     Height = 23
     Align = alTop
diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas
index 82523c1..d49df95 100644
--- a/复合检验管理/U_JYOrderCDOne.pas
+++ b/复合检验管理/U_JYOrderCDOne.pas
@@ -1612,7 +1612,30 @@ begin
 //    showmessage(sql.text);
     ExecSQL;
   end;
+   if (trim(ComboBox1.Text) = '�����뵥') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;                           
+      sql.Clear;
+      sql.add('exec P_Print_CKMDHAEIL_RY ');
+      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=''11'' ');
+      Open;
+    end;
+  end;
   if (trim(ComboBox1.Text) = '�����뵥(Ӣ��)') then
   begin
     with ADOQueryTemp do
diff --git a/复合检验管理/U_ProductOrderNewList.pas b/复合检验管理/U_ProductOrderNewList.pas
index f2e545a..4c9ad1f 100644
--- a/复合检验管理/U_ProductOrderNewList.pas
+++ b/复合检验管理/U_ProductOrderNewList.pas
@@ -31,7 +31,7 @@ type
   TfrmProductOrderNewList = class(TForm)
     ToolBar1: TToolBar;
     TBRafresh: TToolButton;
-    TBFind: TToolButton;
+    TBFind: TToolButton;                             
     TBAdd: TToolButton;
     TBEdit: TToolButton;
     TBDel: TToolButton;