diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm
index e00c9b5..3317220 100644
--- a/检验管理/U_MJManageNewFDNew.dfm
+++ b/检验管理/U_MJManageNewFDNew.dfm
@@ -1674,6 +1674,20 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 20
       OnClick = Button7Click
     end
+    object lastMJLen: TEdit
+      Left = 169
+      Top = 33
+      Width = 90
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 21
+      Visible = False
+    end
   end
   object MovePanel1: TMovePanel
     Left = 634
@@ -3052,4 +3066,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Top = 544
     ReportData = {}
   end
+  object Timer2: TTimer
+    Interval = 500
+    OnTimer = Timer2Timer
+    Left = 1145
+    Top = 285
+  end
 end
diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index 038db63..28ac6e3 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -10,7 +10,20 @@ uses
   cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport,
   RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu,
   ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox,
-  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI;
+  MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI,
+  dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmMJManageNewFDNewSF = class(TForm)
@@ -249,6 +262,8 @@ type
     RM3: TRMGridReport;
     Edit5: TEdit;
     Label43: TLabel;
+    Timer2: TTimer;
+    lastMJLen: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -307,6 +322,7 @@ type
     procedure Timer1Timer(Sender: TObject);
     procedure TBCDClick(Sender: TObject);
     procedure Edit5Click(Sender: TObject);
+    procedure Timer2Timer(Sender: TObject);
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
@@ -335,6 +351,7 @@ type
     function JsXj(str1: string): string;
   public
     fmanage: string;
+    FMBlen: Double;
     { Public declarations }
 
   end;
@@ -1038,12 +1055,13 @@ begin
 //        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
         if Fmbxs > 0 then
         begin
-          FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0) / Fmbxs) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
+//          FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0) / Fmbxs) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
+          FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [(FMBlen / Fmbxs) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
         end
         else
         begin
-          FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
-//          FieldByName('Sjcd').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0)) - StrToFloatdef(trim(MJQty2.Text), 0)]);
+//          FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [(StrToFloatdef(trim(MJLen.Text), 0)) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
+          FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [FMBlen - StrToFloatdef(trim(MJQty2.Text), 0) + fjc]);
         end;
       end;
 
@@ -1574,8 +1592,16 @@ var
   mvalue1: integer;
   i: Integer;
 begin
+  if Abs(StrToFloatDEF(MJLen.Text, 0) - StrToFloatDEF(lastMJLen.Text, 0)) > 5 then
+  begin
+    if Application.MessageBox('�������������5M�Ƿ�����ύ��', '��ʾ', 32 + 4) <> IDYES then
+    begin
+      Exit;
+    end;
+  end;
+  FMBlen := StrToFloatDEF(MJLen.Text, 0);
 
-  if (strtofloatdef(trim(MJLen.Text), 0) = 0) and (strtofloatdef(trim(mjqty4.Text), 0) = 0) then
+  if (FMBlen = 0) and (strtofloatdef(trim(mjqty4.Text), 0) = 0) then
   begin
     application.MessageBox('���Ȼ����������ܶ�Ϊ�㣡', '��ʾ��Ϣ', 0);
     exit;
@@ -1735,7 +1761,7 @@ begin
     end;
 
   end;
-
+  lastMJLen.text := '';
   Label16.Caption := '';
   BTAdd.Click;
   MJLen.SetFocus;
@@ -2507,13 +2533,14 @@ begin
     APID.Text := '';
     FAPID := '';
     FMainId := '';
-    FSubId := '';
+    FSubId := '';                               
     AOrdDefNote1.Text := '';
     MJStr4.Text := '';
     fRollType := '';
-    Exit;
+    Exit;                                           
   end;
   APID.Text := '';
+  LASTMJLEN.Text := '';
   BTAdd.Click;
 end;
 
@@ -2564,14 +2591,14 @@ begin
   with Panel3 do
   begin
     for i := 0 to ControlCount - 1 do
-    begin
+    begin                                          
       if Controls[i] is TSpeedButton then
       begin
         TSpeedButton(Controls[i]).Hint := Trim(TEdit(Sender).Name);
       end;
     end;
-  end;
-end;
+  end;                                          
+end;                                     
 
 procedure TfrmMJManageNewFDNewSF.MJLenChange(Sender: TObject);
 begin
@@ -2986,5 +3013,15 @@ begin
   end;
 end;
 
+procedure TfrmMJManageNewFDNewSF.Timer2Timer(Sender: TObject);
+begin
+
+  if StrToFloatDEF(MJLen.Text, 0) > StrToFloatDEF(lastMJLen.Text, 0) then
+  begin
+    LASTMJLEN.Text := MJLEN.Text;
+  end;
+
+end;
+
 end.