diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm
index 64ed7f7..8042172 100644
--- a/检验管理/U_JYOrderCDOne.dfm
+++ b/检验管理/U_JYOrderCDOne.dfm
@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1218
-    Height = 62
+    Height = 92
     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 = 600
-      Top = 0
+      Left = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = TBMSClick
     end
     object TBPZ: TToolButton
-      Left = 711
-      Top = 0
+      Left = 111
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
       OnClick = TBPZClick
     end
     object ToolButton1: TToolButton
-      Left = 822
-      Top = 0
+      Left = 222
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#21333#20215
       ImageIndex = 54
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 933
-      Top = 0
+      Left = 333
+      Top = 30
       Caption = #25209#37327#20462#25913#23458#25143#21697#21517
       ImageIndex = 56
-      Wrap = True
       OnClick = ToolButton2Click
     end
     object ToolButton3: TToolButton
-      Left = 0
+      Left = 464
       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 = 111
+      Left = 575
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -156,7 +156,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TBPrintBaoClick
     end
     object TBPrintBq: TToolButton
-      Left = 210
+      Left = 674
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -164,33 +164,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TBPrintBqClick
     end
     object TCPDB: TToolButton
-      Left = 297
+      Left = 761
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
       ImageIndex = 57
+      Wrap = True
       Visible = False
       OnClick = TCPDBClick
     end
     object TBPrintJYBB: TToolButton
-      Left = 384
-      Top = 30
+      Left = 0
+      Top = 60
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
       OnClick = TBPrintJYBBClick
     end
     object TBPrint: TToolButton
-      Left = 495
-      Top = 30
+      Left = 111
+      Top = 60
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = TBPrintClick
     end
     object Edit3: TEdit
-      Left = 558
-      Top = 30
+      Left = 174
+      Top = 60
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -203,8 +204,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 626
-      Top = 33
+      Left = 242
+      Top = 63
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -226,24 +227,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         '')
     end
     object ToolButton9: TToolButton
-      Left = 775
-      Top = 30
+      Left = 391
+      Top = 60
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 862
-      Top = 30
+      Left = 478
+      Top = 60
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 925
-      Top = 30
+      Left = 541
+      Top = 60
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -252,7 +253,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
+    Top = 92
     Width = 1218
     Height = 88
     Align = alTop
@@ -774,9 +775,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 150
+    Top = 180
     Width = 1218
-    Height = 431
+    Height = 401
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas
index c6164ed..2cc5afe 100644
--- a/检验管理/U_JYOrderCDOne.pas
+++ b/检验管理/U_JYOrderCDOne.pas
@@ -2090,12 +2090,12 @@ begin
               sql.Add('Update WFB_MJJY Set guige=''' + trim(Fguige.Text) + ''' ');
               sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
             end;
-            if trim(Fguige.text) <> '' then
+            if trim(FSOrddefstr1.text) <> '' then
             begin
               sql.Add('Update WFB_MJJY Set SOrddefstr1=''' + trim(FSOrddefstr1.Text) + ''' ');
               sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
             end;
-            if trim(Fguige.text) <> '' then
+            if trim(Fnote.text) <> '' then
             begin
               sql.Add('Update WFB_MJJY Set note=''' + trim(Fnote.Text) + ''' ');
               sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index b201c16..0f15dac 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -3269,6 +3269,7 @@ end;
 procedure TfrmMJManageNewFDNewSF.Timer1Timer(Sender: TObject);
 begin
   btprint.Enabled := True;
+  Button5.Enabled := True;
   Timer1.Enabled := False;
 end;
 
@@ -3740,12 +3741,12 @@ var
   fPrintFile: string;
   mvalue: Double;
   mvalue1: integer;
-  i: Integer;
+  i: Integer;                        
 begin
   begin
 //  Y1 := false;
     PState := 33;
-    if Edit9.text <> '' then
+    if Edit9.text <> '' then               
     begin
       if (strtofloatdef(trim(MJMaoZ.Text), 0) = 0) then
       begin
@@ -3914,6 +3915,7 @@ begin
   end;
 
   BTPrint.Enabled := False;
+  Button5.Enabled := False;
   Timer1.Enabled := True;
   if SaveData() then
   begin