diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof
index 1ffff72..127059b 100644
--- a/检验管理/TradeManage.dof
+++ b/检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\��ʤ����\�������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJmingsheng\�������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 8042172..b32e379 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1218
-    Height = 92
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 131
@@ -104,42 +104,42 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
-      Wrap = True
       OnClick = TBDWClick
     end
     object TBMS: TToolButton
-      Left = 0
-      Top = 30
+      Left = 600
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = TBMSClick
     end
     object TBPZ: TToolButton
-      Left = 111
-      Top = 30
+      Left = 711
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
       OnClick = TBPZClick
     end
     object ToolButton1: TToolButton
-      Left = 222
-      Top = 30
+      Left = 822
+      Top = 0
       AutoSize = True
       Caption = #25209#37327#20462#25913#21333#20215
       ImageIndex = 54
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 333
-      Top = 30
+      Left = 933
+      Top = 0
       Caption = #25209#37327#20462#25913#23458#25143#21697#21517
       ImageIndex = 56
+      Wrap = True
       OnClick = ToolButton2Click
     end
     object ToolButton3: TToolButton
-      Left = 464
+      Left = 0
       Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#32568#21495
@@ -147,7 +147,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object TBPrintBao: TToolButton
-      Left = 575
+      Left = 111
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -156,7 +156,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TBPrintBaoClick
     end
     object TBPrintBq: TToolButton
-      Left = 674
+      Left = 210
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -164,34 +164,33 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TBPrintBqClick
     end
     object TCPDB: TToolButton
-      Left = 761
+      Left = 297
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
       ImageIndex = 57
-      Wrap = True
       Visible = False
       OnClick = TCPDBClick
     end
     object TBPrintJYBB: TToolButton
-      Left = 0
-      Top = 60
+      Left = 384
+      Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
       OnClick = TBPrintJYBBClick
     end
     object TBPrint: TToolButton
-      Left = 111
-      Top = 60
+      Left = 495
+      Top = 30
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = TBPrintClick
     end
     object Edit3: TEdit
-      Left = 174
-      Top = 60
+      Left = 558
+      Top = 30
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -204,8 +203,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 242
-      Top = 63
+      Left = 626
+      Top = 33
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -223,28 +222,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Items.Strings = (
         #26816#39564#30721#21333'('#31859#25968#37325#37327')'
         #26816#39564#30721#21333'('#31859#25968')'
-        #22806#38144#30721#21333
-        '')
+        #26816#39564#30721#21333'('#33457#22411')'
+        #22806#38144#30721#21333)
     end
     object ToolButton9: TToolButton
-      Left = 391
-      Top = 60
+      Left = 775
+      Top = 30
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 478
-      Top = 60
+      Left = 862
+      Top = 30
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 541
-      Top = 60
+      Left = 925
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -253,7 +252,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 92
+    Top = 62
     Width = 1218
     Height = 88
     Align = alTop
@@ -775,9 +774,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 180
+    Top = 150
     Width = 1218
-    Height = 401
+    Height = 431
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index 2cc5afe..169927a 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -1583,17 +1583,12 @@ begin
   end;
   if (trim(ComboBox1.Text) = '�����뵥') then
   begin
-//    if Edit3.Text=''then
-//    begin
-//      application.MessageBox('�����뵥�ۣ�','��ʾ',0);
-//    end;
     with ADOQueryTemp do
     begin
       Close;
       sql.Clear;
       sql.add('exec P_Print_CKMDYDL_WX ');
       sql.add('@DName=' + quotedstr(Trim(DCode)));
-//      sql.add(',@MdPrice=' + quotedstr(Trim(Edit3.Text)));
       Open;
     end;
     SCreateCDS20(ADOQueryTemp, CDS_HZ);
@@ -1612,17 +1607,12 @@ begin
   end;
   if (trim(ComboBox1.Text) = '�����뵥(����)') or (trim(ComboBox1.Text) = '�����뵥(��������)') then
   begin
-//    if Edit3.Text=''then
-//    begin
-//      application.MessageBox('�����뵥�ۣ�','��ʾ',0);
-//    end;
     with ADOQueryTemp do
     begin
       Close;
       sql.Clear;
       sql.add('exec P_Print_CKMDYDL ');
       sql.add('@DName=' + quotedstr(Trim(DCode)));
-//      sql.add(',@MdPrice=' + quotedstr(Trim(Edit3.Text)));
       Open;
     end;
     SCreateCDS20(ADOQueryTemp, CDS_HZ);
@@ -1635,7 +1625,7 @@ begin
       sql.add('exec P_Do_PrintMd_HZ ');
       sql.add('@mainID=' + quotedstr(Trim('')));
       sql.add(',@DName=' + quotedstr(Trim(DCode)));
-      sql.add(',@flag=''2'' ');
+      sql.add(',@flag=''22'' ');
       Open;
     end;
   end;
@@ -1695,7 +1685,7 @@ begin
   begin
     RM1.LoadFromFile(fPrintFile);
     RM1.ShowReport;
-  end
+  end                                                       
   else
   begin
     Application.MessageBox(PChar('û����' + fPrintFile), '��ʾ', 0);