diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm
index 0bc8f12..ecca417 100644
--- a/检验管理/U_MJManageNewFDNew.dfm
+++ b/检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 311
-  Top = 138
+  Left = 343
+  Top = 281
   Width = 1366
   Height = 738
   Caption = #25104#21697#26816#39564
@@ -186,9 +186,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object ScrollBox1: TScrollBox
-    Left = 774
+    Left = 770
     Top = 87
-    Width = 576
+    Width = 580
     Height = 612
     Align = alClient
     Color = clWhite
@@ -1040,7 +1040,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel2: TPanel
     Left = 545
     Top = 87
-    Width = 209
+    Width = 205
     Height = 612
     Align = alLeft
     BevelInner = bvRaised
@@ -1063,7 +1063,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label3: TLabel
       Left = 144
-      Top = 422
+      Top = 427
       Width = 26
       Height = 22
       Caption = 'cm'
@@ -1102,7 +1102,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label6: TLabel
       Left = 8
-      Top = 422
+      Top = 427
       Width = 42
       Height = 20
       Caption = #24133#23485
@@ -1128,7 +1128,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label10: TLabel
       Left = 8
-      Top = 343
+      Top = 358
       Width = 42
       Height = 20
       Caption = #27491#21697
@@ -1141,7 +1141,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label12: TLabel
       Left = 92
-      Top = 343
+      Top = 358
       Width = 42
       Height = 20
       Caption = #27425#21697
@@ -1194,7 +1194,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label22: TLabel
       Left = 144
-      Top = 459
+      Top = 460
       Width = 36
       Height = 22
       Caption = 'g/'#13217
@@ -1207,7 +1207,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label23: TLabel
       Left = 8
-      Top = 458
+      Top = 459
       Width = 42
       Height = 20
       Caption = #20811#37325
@@ -1219,22 +1219,21 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label27: TLabel
-      Left = 20
-      Top = 745
+      Left = 113
+      Top = 290
       Width = 42
       Height = 20
-      Caption = #36192#36865
+      Caption = #21152#38271
       Font.Charset = ANSI_CHARSET
       Font.Color = clBlue
       Font.Height = -20
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      Visible = False
     end
     object Label26: TLabel
       Left = 8
-      Top = 383
+      Top = 390
       Width = 42
       Height = 20
       Caption = #20986#32440
@@ -1313,7 +1312,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label34: TLabel
       Left = 90
-      Top = 386
+      Top = 393
       Width = 40
       Height = 19
       Caption = #20221#25968
@@ -1378,7 +1377,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label45: TLabel
       Left = 8
-      Top = 262
+      Top = 260
       Width = 42
       Height = 20
       Caption = #21253#21495
@@ -1391,7 +1390,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label28: TLabel
       Left = 8
-      Top = 300
+      Top = 291
       Width = 42
       Height = 20
       Caption = #31354#20056
@@ -1404,7 +1403,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJFK: TEdit
       Left = 51
-      Top = 416
+      Top = 421
       Width = 90
       Height = 32
       Font.Charset = GB2312_CHARSET
@@ -1467,7 +1466,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit3: TEdit
       Left = 52
-      Top = 333
+      Top = 348
       Width = 39
       Height = 35
       Font.Charset = GB2312_CHARSET
@@ -1484,7 +1483,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit4: TEdit
       Left = 134
-      Top = 333
+      Top = 348
       Width = 40
       Height = 35
       Font.Charset = GB2312_CHARSET
@@ -1517,7 +1516,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJSJKZ: TEdit
       Left = 51
-      Top = 453
+      Top = 454
       Width = 90
       Height = 32
       Font.Charset = GB2312_CHARSET
@@ -1531,10 +1530,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJQty2: TEdit
-      Left = 69
-      Top = 736
-      Width = 90
-      Height = 35
+      Left = 116
+      Top = 312
+      Width = 82
+      Height = 33
+      AutoSize = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -27
@@ -1542,7 +1542,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 17
-      Visible = False
       OnChange = MJQty2Change
       OnClick = Edit1Click
       OnKeyDown = MJQty4KeyDown
@@ -1550,7 +1549,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit6: TEdit
       Left = 52
-      Top = 377
+      Top = 384
       Width = 40
       Height = 35
       Font.Charset = GB2312_CHARSET
@@ -1618,7 +1617,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object ComboBox1: TComboBox
       Left = 132
-      Top = 378
+      Top = 385
       Width = 45
       Height = 35
       Style = csDropDownList
@@ -1708,7 +1707,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object baoNo: TEdit
       Left = 57
-      Top = 254
+      Top = 252
       Width = 90
       Height = 35
       Font.Charset = GB2312_CHARSET
@@ -1745,10 +1744,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Button7Click
     end
     object Edit5: TEdit
-      Left = 58
-      Top = 292
-      Width = 90
-      Height = 35
+      Left = 8
+      Top = 312
+      Width = 69
+      Height = 33
+      AutoSize = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -27
@@ -1762,8 +1762,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object ComboBox3: TComboBox
-      Left = 156
-      Top = 254
+      Left = 151
+      Top = 252
       Width = 45
       Height = 35
       Style = csDropDownList
@@ -1787,7 +1787,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         '100')
     end
     object Edit13: TEdit
-      Left = 156
+      Left = 151
       Top = 217
       Width = 40
       Height = 35
@@ -1805,8 +1805,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object MovePanel1: TMovePanel
-    Left = 869
-    Top = 91
+    Left = 757
+    Top = 83
     Width = 351
     Height = 238
     BevelInner = bvLowered
@@ -2055,7 +2055,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object Panel7: TPanel
-    Left = 754
+    Left = 750
     Top = 87
     Width = 20
     Height = 612
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index 8fd842f..92936f3 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -985,54 +985,28 @@ begin
       end
       else
       begin
-        if trim(fOrderUnit) <> 'KG' then
-          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc
-        else
-          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + fjc;
+//        if trim(fOrderUnit) <> 'KG' then
+//          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc
+//        else
+//          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + fjc;
+        MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + StrToFloatdef(trim(MJQty2.Text), 0);
       end;
 
       if Edit5.Text <> '' then
       begin
-//        if fxsws = '1' then
-//        begin
-//          i := StrToFloatdef(trim(MJLen.Text), 0) * StrToFloatdef(trim(Edit5.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
-//          MFMJLen := FloatToStr(RoundTo(i, -1));
-//        end;
-//        if fxsws = '2' then
-//        begin
-//          i := StrToFloatdef(trim(MJLen.Text), 0) * StrToFloatdef(trim(Edit5.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
-//          MFMJLen := FloatToStr(RoundTo(i, -2));
-//        end;
-//        if fxsws = '3' then
-//        begin
-//          i := StrToFloatdef(trim(MJLen.Text), 0) * StrToFloatdef(trim(Edit5.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
-//          MFMJLen := FloatToStr(RoundTo(i, -3));
-//        end;
-        i := StrToFloatdef(trim(MJLen.Text), 0) * StrToFloatdef(trim(Edit5.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
+        i := StrToFloatdef(trim(MJLen.Text), 0) * StrToFloatdef(trim(Edit5.Text), 0) + StrToFloatdef(trim(MJQty2.Text), 0); //+ fjc
         MFMJLen := StrToFloat(format('%.' + trim(fxsws) + 'f', [i]));
- 
-//        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) * StrToFloatdef(trim(Edit5.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc
+
       end
       else
       begin
-        if trim(fOrderUnit) <> 'KG' then
-          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc
-        else
-          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + fjc;
-
-//        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) + fjc;
+//        if trim(fOrderUnit) <> 'KG' then
+//          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc
+//        else
+//          MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + fjc;
+        MFMJLen := StrToFloatdef(trim(MJLen.Text), 0) + StrToFloatdef(trim(MJQty2.Text), 0);
       end;
 
-//      if Label9.Caption = 'M' then
-//      begin
-//        X := FieldByName('MJLen').Value / 0.9144;
-//        FieldByName('MJLen1').Value := format('%.' + trim(fxsws) + 'f', [X]);
-//      end
-//      else
-//      begin
-//        Y := FieldByName('MJLen').Value * 0.9144;
-//        FieldByName('MJLen1').Value := format('%.' + trim(fxsws) + 'f', [Y]);
-//      end;
       if Label9.Caption = 'M' then
       begin
         FieldByName('MJLen').Value := MFMJLen;
@@ -1047,16 +1021,16 @@ begin
       FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0);
       FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0);
       FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0);
-      if trim(fOrderUnit) = 'KG' then
-      begin
-        FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjZ;
-        FieldByName('MJMaoZ').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjZ;
-      end
-      else
-      begin
-        FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ;
-        FieldByName('MJMaoZ').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) + fjZ;
-      end;
+//      if trim(fOrderUnit) = 'KG' then
+//      begin
+//        FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjZ;
+//        FieldByName('MJMaoZ').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjZ;
+//      end
+//      else
+//      begin
+      FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ;
+      FieldByName('MJMaoZ').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) + fjZ;
+//      end;
 
       if Trim(MJFK.Text) <> '' then
       begin
@@ -1749,7 +1723,7 @@ begin
   begin
     MJMaoZ.Text := '';
     MJQty1.Text := '';
-    MJQty2.Text := '';
+//    MJQty2.Text := '';
     Label15.Caption := '';
     MJQty4.Text := '';
 
@@ -2544,7 +2518,7 @@ begin
     FJZ := ADOTmp.fieldbyname('jiazhong').AsFloat;
     FJC := ADOTmp.fieldbyname('jiachang').AsFloat;
     FDC := StrToFloatDef(ADOTmp.fieldbyname('DC').asstring, 0);
-
+    MJQty2.text := floattostr(ADOTmp.fieldbyname('jiachang').AsFloat);
     fbaotype := Trim(ADOTmp.fieldbyname('baotype').AsString);
     fbaosx := Trim(ADOTmp.fieldbyname('baosx').AsString);
     fOrderUnit := uppercase(Trim(ADOTmp.fieldbyname('OrderUnit').AsString));
@@ -2553,16 +2527,16 @@ begin
       Label9.Caption := 'Y';
     end
     else
-    begin                                     
+    begin
       Label9.Caption := 'M'
-    end;                                   
+    end;
     if FDC <> 0 then
     begin
       Edit12.Visible := True;
       Label51.Visible := True;
       Edit12.Text := '��';
     end
-    else                                                          
+    else
     begin
       Edit12.Visible := False;
       Label51.Visible := False;
@@ -2900,7 +2874,7 @@ begin
  // CDS_MJID.First;
   with ADOQueryPrint do
   begin
-    Close;
+    Close;                                            
     SQL.Clear;
     sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.KHorderNo,');
     sql.Add('PRTCodeName=DBO.F_Get_Order_SubStr(BaoID,''BNCodeName''),');