diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs index 557eceb..a9eb8b0 100644 --- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs +++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs @@ -1152,8 +1152,8 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo // sql += " WHERE 1=1 and e.ID is null "; sqlString.Append($@"select * from (select row_number() over(partition by a.TransferNO order by a.TransferNO) row, a.TransferNO as Code,a.ID,CONVERT(varchar(100),a.CreateDateTime,23) as MTIME,a.CreatePerson as MUSER, - g.Status as Status1, -f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1, + g.Status as Status1,f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1, + case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy, f.cFree2,f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10 from ICSTransfer a left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint @@ -2010,7 +2010,7 @@ c.Sequence, } if (Convert.ToDecimal(chkdr["Quantity"]) < ZLQty) { - throw new Exception("物料:"+ chkdr["InvCode"].ToString() + "实际拣料数量大于单据需求数量,请尝试重新拣料。"); + throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量大于单据需求数量,请尝试重新拣料。"); } } #endregion