Luy
/
NWeiWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整拣料显示

master
lilili 2 years ago
parent
938b163a83
commit
a09e2780be
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  2. 2
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

10
WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
View File

@ -121,7 +121,7 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
a.ApplyCode as Code,CONVERT(varchar(100),a.CreateDateTime,23) as MTIME,a.createperson as MUSER,a.WHCode,detail.LocationCode AS Area,
a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName,
a.ReceiverNumber,case when a.MUSERName = 'JOB' then a.ReceiverName else n.F_RealName end as ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,
a.ReceiverNumber,case when a.MUSERName = 'JOB' then a.ReceiverName else a.MUSERName end as ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,
case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan ,
g.Status, ISNULL(p.PrintCount, 0) as PrintCount,
case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy,
@ -135,7 +135,7 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
LEFT JOIN ICSPrintCount p ON a.APPlyCode=p.TransCode
LEFT JOIN ICSInventoryDetail detail ON b.InvCode=detail.INVCode AND a.WHCode=detail.WHCode AND a.WorkPoint=detail.WorkPoint
left join ICSMOPickMerge e on a.ID=e.SourceID and a.WorkPoint=e.WorkPoint
left join Sys_SRM_User n ON n.F_Account=a.MUSERName
--left join Sys_SRM_User n ON n.F_Account=a.MUSERName
left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint
left join (SELECT ApplyCode,
case when sum(Quantity) =sum(IssueQuantity) and MUSERName != 'JOB' then '已过账'
@ -187,7 +187,7 @@ left join Sys_SRM_ItemsDetail j on j.F_Define3='HGAreaConfig' AND j.F_Define1=a
f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10,g.Status,
a.WHCode,detail.LocationCode,a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName,
a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,a.MUSERName,a.MUSER,p.PrintCount,n.F_RealName) as t where t.row=1");
a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,a.MUSERName,a.MUSER,p.PrintCount) as t where t.row=1");
if (!string.IsNullOrWhiteSpace(queryParam["Status"].ToString()))
{
@ -221,7 +221,7 @@ left join Sys_SRM_ItemsDetail j on j.F_Define3='HGAreaConfig' AND j.F_Define1=a
string sql = @"SELECT * FROM (select row_number() over(partition by a.ApplyCode,a.InvCode,a.Sequence ORDER BY a.ApplyCode) as row,
a.ID,a.ApplyCode as Code,a.Sequence,a.MTIME,a.MUSERName,a.MUSER,a.WHCode,b.WarehouseName ,a.InvCode,a.OrderNumber,
a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName,
a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.InvDescribe,a.Unit,a.StockIndicator,
a.ReceiverNumber,case when a.MUSERName = 'JOB' then a.ReceiverName else a.MUSERName end as ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.InvDescribe,a.Unit,a.StockIndicator,
d.InvName,d.InvDesc,d.InvStd,d.InvUnit,detail.LocationCode AS Area,a.SAPSequence,
case when e.SourceID is null then '未合并' else '已合并' end as IsNew,a.Quantity
,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4
@ -297,7 +297,7 @@ left join Sys_SRM_ItemsDetail j on j.F_Define3='HGAreaConfig' AND j.F_Define1=a
a.ApplyCode as Code,CONVERT(varchar(100),a.CreateDateTime,23) as MTIME,a.createperson as MUSER,a.WHCode,detail.LocationCode AS Area,
a.EATTRIBUTE,a.Sets,a.OrderInvCode,a.OrderInvDescribe,a.BillType,a.Remarks,a.Desks,a.DispatchNumber,a.DispatcherName,
a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,
a.ReceiverNumber,case when a.MUSERName = 'JOB' then a.ReceiverName else a.MUSERName end as ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.Unit,a.StockIndicator,
case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan,a.CustomerName,a.Pagination,
g.Status,ISNULL(p.PrintCount, 0) as PrintCount,
case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy,

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

@ -70,7 +70,7 @@
//cols.push(collast);
var collast = { label: '拣料人姓名', name: 'PickName', width: 100, align: 'left' };
cols.push(collast);
var collast = { label: '收料人姓名', name: 'ReceiverName', width: 150, align: 'left' };
var collast = { label: '收料人姓名/工号', name: 'ReceiverName', width: 150, align: 'left' };
cols.push(collast);
var collast = { label: '需求日期', name: 'NeedDate', width: 120, align: 'left' };
cols.push(collast);

Write Preview
Loading…
Cancel
Save