diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs index 069b25d..1fc3106 100644 --- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs +++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs @@ -688,7 +688,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'"; from ICSTransfer a left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint left join ICSExtension f on a.ExtensionID = f.ID and a.WorkPoint = f.WorkPoint - where a.WorkPoint = '{WorkPoint}' and a.Status = '1'"); + where a.WorkPoint = '{WorkPoint}' and a.Status = '2'"); if (!string.IsNullOrWhiteSpace(queryJson)) { if (!string.IsNullOrWhiteSpace(queryParam["POCode"].ToString())) diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml index f1be8bf..35480f6 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml @@ -281,6 +281,8 @@ } } if (Type == '7') { + var myDate = new Date(); + var nowDate = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate(); if (!!DNCode && !!Sequence) { $.ajax({ url: "/WMS/WMSCreateItemLot/GetSubGridJsonSHDHByCreate?DNCode=" + DNCode + "&Sequence=" + Sequence + "&WorkPoint=" + WorkPoints, @@ -295,7 +297,7 @@ $("#CreatedQty").val(data.rows[0].CreatedQty); $("#thisCreateQty").val(data.rows[0].thisCreateQty); $("#YAmount").val(data.rows[0].Amount); - + $("#PRODUCTDATE").val(nowDate); $("#EffectiveEnable").val(data.rows[0].EffectiveEnable); $("#EffectiveDays").val(data.rows[0].EffectiveDays); VenCode = data.rows[0].VenCode;