diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs index 4712c74..1c8efdd 100644 --- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs +++ b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs @@ -1241,7 +1241,7 @@ where a.ODNType='1' and a.Status='2' and a.OASNCode is null"; object Figure = GetDecimalDigits(); #region [SQL] string sql = @" -select a.ID,a.RCVCode,a.Sequence,a.WHCode,a.InvCode,a.EATTRIBUTE,a.WorkPoint,a.InvDescribe,a.OrderNumber, +select a.ID,a.RCVCode,a.Sequence,a.WHCode,a.InvCode,a.EATTRIBUTE,a.WorkPoint,a.InvDescribe,a.OrderNumber,a.Desks,a.DispatcherName, a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Unit, a.StockIndicator,a.RemarksTerm,detail.LocationCode AS Area, b.InvName,b.InvStd,b.InvDesc,b.InvUnit,CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity , CAST(a.Amount AS DECIMAL(18,{0})) as Amount,CAST(a.RCVQuantity AS DECIMAL(18,{0})) as RCVQuantity ,a.CreatePerson,a.CreateDateTime,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml index 4f7eb94..bd33323 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml @@ -511,6 +511,12 @@ cols.push(collast); var collast = { label: '辅助描述', name: 'InvDesc', width: 50, align: 'left' }; cols.push(collast); + + var collast = { label: '工位', name: 'Desks', width: 50, align: 'left' }; + cols.push(collast); + var collast = { label: '调度姓名', name: 'DispatcherName', width: 120, align: 'left' }; + cols.push(collast); + var collast = { label: '料品型号', name: 'InvStd', width: 150, align: 'left', hidden: true }; cols.push(collast); var collast = { label: '料品单位', name: 'InvUnit', width: 50, align: 'left' };