diff --git a/KanBan/NFine.Application/SRM/WatchPanelApp.cs b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
index fca01e5..18418ae 100644
--- a/KanBan/NFine.Application/SRM/WatchPanelApp.cs
+++ b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
@@ -230,23 +230,20 @@ and CreatedOn>CAST(CAST(GETDATE()  as date) as varchar(10)) + ' 00:00:00' and st
 	                                   a.InvCode,
 	                                   c.LotNo,
 	                                   c.Quantity,
-	                                   c.FromLocationCode,
-	                                   d.LocationCode,
-	                                   e.TaskCode 
+	                                   e.StartLocation,
+	                                   e.EndLocation
+-- 	                                   e.TaskCode 
                                    FROM
 	                                   ICSMOApply a
-	                                   INNER JOIN ICSContainerReceiptsNumber b ON a.ApplyCode= b.TransCode 
-	                                   INNER JOIN ICSWareHouseLotInfoLog c ON c.TransCode= b.TransCode 
+-- 	                                   INNER JOIN ICSContainerReceiptsNumber b ON a.ApplyCode= b.TransCode 
+	                                   INNER JOIN ICSWareHouseLotInfoLog c ON a.ApplyCode= c.TransCode  AND
+	                                   c.BusinessCode= '15' 
 	                                   AND a.Sequence= c.TransSequence 
-	                                   INNER JOIN ICSContainer d ON d.ContainerCode= b.ContainerCode 
-	                                   AND d.WorkPoint= c.WorkPoint
-	                                   INNER JOIN ICSAGVTaskLog e ON e.ContainerCode= d.ContainerCode 
-	                                   AND d.LocationCode= e.LocationCode 
-	                                   AND e.WorkPoint= d.WorkPoint 
+	                                   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
+	                                  
                                    WHERE
-                                       a.WorkPoint='{workpoint}' AND
-	                                   c.BusinessCode= '15' 
-	                                   AND d.EATTRIBUTE1!= '已搬运'";
+                                       a.WorkPoint='1701'";
 
             //if (!string.IsNullOrWhiteSpace(StratTime))
             //{
diff --git a/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml b/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml
index 385e025..5257776 100644
--- a/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml
+++ b/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml
@@ -75,7 +75,7 @@
                                 <span class="span1">条码应领数量</span> 
                                 <span class="span1">货位</span>
                                 <span class="span2">出货点位</span>
-                                <span class="span1">WMS任务编号</span>
+                                @*<span class="span1">WMS任务编号</span>*@
                                 @*<span class="span1">子件项数</span>
                                 <span class="span1">完成项数</span>*@ 
                             </div>
@@ -206,7 +206,7 @@
                         for (var i = 0; i < data.length; i++) {
                             html += ' <li>  <span>' + data[i].ApplyCode + '</span> <span class="span2">' + data[i].Sequence + '</span> <span class="span2">' + data[i].SAPSequence + '</span>';
                             html += '     <span class="span1">' + data[i].InvCode + '</span> <span class="span1">' + data[i].LotNo + '</span> <span class="span1">' + data[i].Quantity + '</span>';
-                            html += '     <span class="span1">' + data[i].FromLocationCode + '</span> <span class="span1">' + data[i].LocationCode + '</span> <span class="span4">' + data[i].TaskCode + '</span>';
+                            html += '     <span class="span1">' + data[i].FromLocationCode + '</span> <span class="span1">' + data[i].LocationCode + '</span>';//<span class="span4">' + data[i].TaskCode + '</span>';
                             //html += '     <span>' + data[i].完成项数 + '</span>';
                         }
                         html += "</ul>";