Browse Source

no message

master
陆晔 2 years ago
parent
commit
99de43d1d8
  1. 2
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  2. 2
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

2
WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@ -1143,7 +1143,7 @@ f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1,
end as IsNew, end as IsNew,
case when max(k.TransCode) is null then '' else '' end as IsOccupy, case when max(k.TransCode) is null then '' else '' end as IsOccupy,
case when sum(a.Quantity)=sum(a.TransferQuantity) then '' case when sum(a.Quantity)=sum(a.TransferQuantity) then ''
when sum(a.Quantity)!=sum(a.TransferQuantity) and a.TransferQuantity>0 then ''
when sum(a.Quantity)!=sum(a.TransferQuantity) and sum(a.TransferQuantity)>0 then ''
else '' END AS Status, else '' END AS Status,
f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1, f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1,
f.cFree2,f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10 f.cFree2,f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10

2
WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

@ -10,6 +10,7 @@
var flag = '1'; var flag = '1';
var mark = '拣料'; var mark = '拣料';
var Arguments = ''; var Arguments = '';
$.ajaxSettings.async = false;//设置全局同步
//var PickID = ''; //var PickID = '';
$(function () { $(function () {
@ -194,7 +195,6 @@
} }
function gridList() { function gridList() {
var Type = $("#selShow").val(); var Type = $("#selShow").val();
var $gridList = $("#gridList"); var $gridList = $("#gridList");

Loading…
Cancel
Save