diff --git a/KanBan/NFine.Application/SRM/WatchPanelApp.cs b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
index 4863bcf..6d596d7 100644
--- a/KanBan/NFine.Application/SRM/WatchPanelApp.cs
+++ b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
@@ -19,6 +19,7 @@ namespace NFine.Application.WMS
         private static string StratTimecfg = ConfigurationManager.ConnectionStrings["StratTime"].ConnectionString;
         private static string EndTimecfg = ConfigurationManager.ConnectionStrings["EndTime"].ConnectionString;
         private static string advDays = ConfigurationManager.ConnectionStrings["advDays"].ConnectionString;
+        private static string workPoint = ConfigurationManager.ConnectionStrings["WorkPoint"].ConnectionString;
 
         string StratTime = DateTime.Parse(DateTime.Now.AddDays(-1).ToString()).ToString("yyyy-MM-dd") + ' ' + StratTimecfg;
         string EndTime = DateTime.Parse(DateTime.Now.ToString()).ToString("yyyy-MM-dd") + ' ' + EndTimecfg;
@@ -241,10 +242,10 @@ and CreatedOn>CAST(CAST(GETDATE()  as date) as varchar(10)) + ' 00:00:00' and st
 	                                   c.TransType= '15' 
 	                                   AND a.Sequence= c.TransSequence 
 	                                   INNER JOIN ( SELECT DISTINCT e.StartLocation,e.EndLocation FROM                                     
-                                       ICSForkLiftTaskLog e WHERE e.EndLocation is not null AND e.EndLocation!='' ) e ON  c.FromLocationCode= e.StartLocation
+                                       ICSForkLiftTaskLog e WHERE e.EndLocation is not null AND e.EndLocation!=''AND (e.EATTRIBUTE1 IS NULL OR e.EATTRIBUTE1!='己回库') ) e ON  c.FromLocationCode= e.StartLocation
 	                                  
                                    WHERE
-                                       a.WorkPoint='1701'";
+                                       a.WorkPoint in({workPoint})";
 
             //if (!string.IsNullOrWhiteSpace(StratTime))
             //{