diff --git a/KanBan/NFine.Application/SRM/WatchPanelApp.cs b/KanBan/NFine.Application/SRM/WatchPanelApp.cs index 18418ae..3e29c54 100644 --- a/KanBan/NFine.Application/SRM/WatchPanelApp.cs +++ b/KanBan/NFine.Application/SRM/WatchPanelApp.cs @@ -226,7 +226,7 @@ and CreatedOn>CAST(CAST(GETDATE() as date) as varchar(10)) + ' 00:00:00' and st string SqlText = $@" SELECT a.ApplyCode, A.Sequence, - a.SAPSequence, + --a.SAPSequence, a.InvCode, c.LotNo, c.Quantity, @@ -236,7 +236,8 @@ and CreatedOn>CAST(CAST(GETDATE() as date) as varchar(10)) + ' 00:00:00' and st FROM ICSMOApply a -- INNER JOIN ICSContainerReceiptsNumber b ON a.ApplyCode= b.TransCode - INNER JOIN ICSWareHouseLotInfoLog c ON a.ApplyCode= c.TransCode AND + INNER JOIN ICSWareHouseLotInfoLog c ON a.ApplyCode= c.TransCode + AND c.BusinessCode= '15' AND a.Sequence= c.TransSequence INNER JOIN ( SELECT DISTINCT e.StartLocation,e.EndLocation FROM diff --git a/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml b/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml index 5257776..5bb399c 100644 --- a/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml +++ b/KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml @@ -204,10 +204,15 @@ // <span class="span1">子件项数</span> <span class="span1">完成项数</span> var html = "<ul>"; 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>' + data[i].完成项数 + '</span>'; + //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].StartLocation + '</span> <span class="span1">' + data[i].EndLocation + '</span>';//<span class="span4">' + data[i].TaskCode + '</span>'; + ////html += ' <span>' + data[i].完成项数 + '</span>'; + + html += ' <li> <span>' + data[i].ApplyCode + '</span> <span class="span2">' + data[i].Sequence + '</span> <span class="span2">' + data[i].InvCode + '</span>'; + html += '<span class="span1">' + data[i].LotNo + '</span> <span class="span1">' + data[i].Quantity + '</span>'; + html += '<span class="span1">' + data[i].StartLocation + '</span> <span class="span1">' + data[i].EndLocation + '</span>';//<span class="span4">' + data[i].TaskCode + '</span>'; + } html += "</ul>"; $("#WIPRCV").html(html);