diff --git a/复合检验管理/TradeManage.dof b/复合检验管理/TradeManage.dof
index d888034..3f1901e 100644
--- a/复合检验管理/TradeManage.dof
+++ b/复合检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\�¸�\���ϼ������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJkefu\���ϼ������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm
index 9cefa29..0b0534d 100644
--- a/复合检验管理/U_MJManageNewFDNew.dfm
+++ b/复合检验管理/U_MJManageNewFDNew.dfm
@@ -1,7 +1,7 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 387
+  Left = 390
   Top = 217
-  Width = 1368
+  Width = 1365
   Height = 754
   Caption = #25104#21697#26816#39564
   Color = clBtnFace
@@ -208,7 +208,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 1151
     Top = 87
-    Width = 201
+    Width = 198
     Height = 628
     Align = alClient
     Color = clWhite
@@ -2804,7 +2804,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1352
+    Width = 1349
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2977,7 +2977,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1352
+    Width = 1349
     Height = 57
     Align = alTop
     BevelInner = bvRaised
@@ -3350,8 +3350,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object ScrollBox2: TScrollBox
-    Left = -404
-    Top = 472
+    Left = -500
+    Top = 536
     Width = 653
     Height = 457
     Font.Charset = GB2312_CHARSET
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index e715e25..983fdf8 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -689,7 +689,7 @@ procedure TfrmMJManageNewFDNewSF.InitCDGridID();
 begin
   with ADOQueryMain do
   begin
-    Close;
+    Close;                              
     SQL.Clear;
     sql.Add('select ');
     //sql.Add('Case when isnull(MJType,'''')=''��Ʒ'' then ''B''+RTrim(Cast(MJXH as varchar(20))) else Cast(MJXH as varchar(20)) end as MJXH ,');
@@ -697,6 +697,7 @@ begin
     if Trim(SCXFlag) <> '' then
       sql.Add(' and JTType=''' + Trim(SCXFlag) + '''');
     sql.Add('and mjstr2=''��'' ');
+    sql.Add('and filltime>CONVERT(char(10),getdate()-7,23)');
     sql.Add(' order by FillTime desc');
     Open;
   end;
@@ -2642,7 +2643,6 @@ begin
 //    sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)');
     sql.Add('maxBaoNO=case when B.baosx=''����ɫ����'' then 1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID and X.subid=C.subID ),0)');
     sql.Add(' else 1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.mainID=C.mainID ),0) end ');
-
     sql.Add('from JYOrder_Sub C');
     SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
     sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
@@ -3609,7 +3609,7 @@ begin
       end;
     end;
   finally
-    frmSCPersonColor.close;                         
+    frmSCPersonColor.close;
   end;
 end;