diff --git a/复合检验管理/TradeManage.dof b/复合检验管理/TradeManage.dof
index 5914e60..a49c66b 100644
--- a/复合检验管理/TradeManage.dof
+++ b/复合检验管理/TradeManage.dof
@@ -136,6 +136,3 @@ ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm
index 76f857e..e6625e0 100644
--- a/复合检验管理/U_MJManageNewFDNew.dfm
+++ b/复合检验管理/U_MJManageNewFDNew.dfm
@@ -47,7 +47,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 425
-    Height = 628
+    Height = 636
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -191,8 +191,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 1151
     Top = 87
-    Width = 201
-    Height = 628
+    Width = 209
+    Height = 636
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -1043,7 +1043,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 425
     Top = 87
     Width = 512
-    Height = 628
+    Height = 636
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2296,7 +2296,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 937
     Top = 87
     Width = 214
-    Height = 628
+    Height = 636
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2305,7 +2305,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 303
+      Height = 311
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2413,7 +2413,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 305
+      Top = 313
       Width = 210
       Height = 28
       Align = alBottom
@@ -2428,7 +2428,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 333
+      Top = 341
       Width = 210
       Height = 293
       Align = alBottom
@@ -2641,7 +2641,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1352
+    Width = 1360
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2814,7 +2814,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1352
+    Width = 1360
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index a893dbf..0a099f2 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -670,7 +670,7 @@ begin
   begin
     try
       Tp := GetProcAddress(Th, 'CommOpen');
-      if Tp <> nil then                                 
+      if Tp <> nil then
       begin
         Tf := TMyFunc(Tp);
         newh := Tf(self.Handle, 'Comm1', 500, 1);
@@ -1782,11 +1782,25 @@ begin
     application.MessageBox('���Ȼ����������ܶ�Ϊ�㣡', '��ʾ��Ϣ', 0);
     exit;
   end;
-  if (strtofloatdef(trim(MJMaoZ.Text), 0) <10) or (strtofloatdef(trim(mjqty4.Text), 0) <10) then
+//  if (strtofloatdef(trim(MJMaoZ.Text), 0) < 10) or (strtofloatdef(trim(mjqty4.Text), 0) < 10) then
+//  begin
+//    application.MessageBox('��������С��10��', '��ʾ��Ϣ', 0);
+//    exit;
+//  end;
+  if (strtofloatdef(trim(MJMaoZ.Text), 0) < 10)  then
   begin
-    application.MessageBox('��������С��10��', '��ʾ��Ϣ', 0);
+    application.MessageBox('ë�ز���С��10��', '��ʾ��Ϣ', 0);
     exit;
   end;
+  if (Trim(Edit9.Text) = '��') then
+  begin
+    if (strtofloatdef(trim(mjqty4.Text), 0) < 10) then
+    begin
+      application.MessageBox('���ز���С��10��', '��ʾ��Ϣ', 0);
+      exit;
+    end;
+  end;
+
   if Trim(FAPID) = '' then
     Exit;