diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas
index 40bbd6e..d822fe6 100644
--- a/检验管理/U_MJManageNewFDNew.pas
+++ b/检验管理/U_MJManageNewFDNew.pas
@@ -1,5 +1,5 @@
 unit U_MJManageNewFDNew;
-                                  
+
 interface
 
 uses
@@ -935,7 +935,7 @@ begin
       end;
     end;
   end;
-end;
+end;                                     
 
 function TfrmMJManageNewFDNewSF.SaveData(): Boolean;
 var
@@ -1345,7 +1345,7 @@ begin
         Close;
         SQL.Clear;
         sql.Add('select Top 1 MJXH,MJID from WFB_MJJY A  ');
-        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and A.subID=''' + Trim(FSubId) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' order by MJXH Desc');
         Open;
       end;
@@ -1410,7 +1410,7 @@ begin
       begin
         Close;
         sql.Clear;
-        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + '''  and X.Subid=''' + Trim(FsubId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' Group by subid,MJStr4,MJXH having count(*)>1');
         Open;
       end;
@@ -3152,7 +3152,7 @@ begin
   begin
     if Trim(Label24.Caption) = '' then
       Exit;
-                                              
+
     InitCDGridID();
     InitCDGrid();
 //    BtnStatus(True);