diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index a4ffa7a..02e994f 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -1388,19 +1388,19 @@ begin
     exit;
   end;
 
-end;
+end;                          
 
 procedure TfrmJYOrderCDOne.ToolButton5Click(Sender: TObject);
 var
   fPrintFile, fPrintFile10, FMainID: string;
   sqlStr: string;
 begin
-  if (ComboBox1.ItemIndex = 4) and (Edit3.Text = '') then
-  begin
-    Application.MessageBox('�����붨��', '��ʾ', 0);
-    Exit;
-  end;
-
+//  if (ComboBox1.ItemIndex = 4) and (Edit3.Text = '') then
+//  begin
+//    Application.MessageBox('�����붨��', '��ʾ', 0);
+//    Exit;
+//  end;
+                                                                      
   if Order_Main.IsEmpty then
     Exit;
   if trim(ComboBox1.Text) = '' then
@@ -1479,7 +1479,7 @@ begin
     ExecSQL;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥(Ӣ��)') or (ComboBox1.ItemIndex = 0) then
+  if (trim(ComboBox1.Text) = '�����뵥(Ӣ��)')  then
   begin
     with ADOQueryTemp do
     begin
@@ -1504,7 +1504,7 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥(����)') or (ComboBox1.ItemIndex = 1) then
+  if (trim(ComboBox1.Text) = '�����뵥(����)')  then
   begin
     with ADOQueryTemp do
     begin
@@ -1574,10 +1574,10 @@ begin
       sql.add('@mainID=' + quotedstr(Trim('')));
       sql.add(',@DName=' + quotedstr(Trim(DCode)));
       sql.add(',@flag=''2'' ');
-      Open;
+      Open;                                          
     end;
   end;
-  if (trim(ComboBox1.Text) = '�����뵥(����)') or (ComboBox1.ItemIndex = 4) then
+  if (trim(ComboBox1.Text) = '�����뵥(����)')   then
   begin
     with ADOQueryTemp do
     begin
@@ -1604,7 +1604,9 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥') or (trim(ComboBox1.Text) = '�����뵥(����ë)') or (trim(ComboBox1.Text) = '�����뵥(���;�ë)') or (trim(ComboBox1.Text) = '�����뵥(ɫ������)') or (ComboBox1.ItemIndex = 5) then
+  if (trim(ComboBox1.Text) = '�����뵥') or (trim(ComboBox1.Text) = '�����뵥(����ë)')
+  or (trim(ComboBox1.Text) = '�����뵥(���;�ë)') or (trim(ComboBox1.Text) = '�����뵥(ɫ������)')
+ or (trim(ComboBox1.Text) = '�����뵥(��������)') then
   begin
     with ADOQueryTemp do
     begin
@@ -1629,7 +1631,7 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥(Ⱦɫ)') or (ComboBox1.ItemIndex = 2) then
+  if (trim(ComboBox1.Text) = '�����뵥(Ⱦɫ)')   then
   begin
     with ADOQueryTemp do
     begin
@@ -1654,7 +1656,7 @@ begin
       Open;
     end;
   end;
-  if (trim(ComboBox1.Text) = '�����뵥(ӡ��)') or (ComboBox1.ItemIndex = 3) then
+  if (trim(ComboBox1.Text) = '�����뵥(ӡ��)')  then
   begin
     with ADOQueryTemp do
     begin