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

调整接口

master
lilili 2 years ago
parent
5d57a02efe efc78f9c8b
commit
48460a2beb
2 changed files with 120 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  2. 5
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

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

@ -137,7 +137,7 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint left join ICSExtension f on a.ExtensionID=f.ID and a.WorkPoint=f.WorkPoint
left join (SELECT ApplyCode, left join (SELECT ApplyCode,
case when sum(Quantity) =sum(IssueQuantity) and MUSERName != 'JOB' then '已过账' case when sum(Quantity) =sum(IssueQuantity) and MUSERName != 'JOB' then '已过账'
else (case when sum(Quantity) =sum(IssueQuantity) and MUSERName = 'JOB' then '已配料'
else (case when sum(Quantity) =sum(IssueQuantity) and MUSERName = 'JOB' AND sum(IssueQuantity)>0 then '已配料'
else '未配料' end) end as Status else '未配料' end) end as Status
from ICSMOApply where WorkPoint='{WorkPoint}' and EATTRIBUTE!='17' group by ApplyCode,MUSERName) g on a.ApplyCode = g.ApplyCode from ICSMOApply where WorkPoint='{WorkPoint}' and EATTRIBUTE!='17' group by ApplyCode,MUSERName) g on a.ApplyCode = g.ApplyCode
left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLotInfoLog ) k on a.ApplyCode=k.TransCode and a.WorkPoint=k.WorkPoint and k.TransType='15' left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLotInfoLog ) k on a.ApplyCode=k.TransCode and a.WorkPoint=k.WorkPoint and k.TransType='15'
@ -298,8 +298,14 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan , case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan ,
g.Status, g.Status,
case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy, case when max(k.TransCode) is null then '未占料' else '已占料' end as IsOccupy,
<<<<<<< HEAD
--case when sum(a.Quantity) =sum(IssueQuantity) and a.MUSERName != 'JOB' then '已过账' --case when sum(a.Quantity) =sum(IssueQuantity) and a.MUSERName != 'JOB' then '已过账'
--else (case when sum(a.Quantity) =sum(IssueQuantity) and a.MUSERName = 'JOB' then '已配料' else '未配料' end) end as Status, --else (case when sum(a.Quantity) =sum(IssueQuantity) and a.MUSERName = 'JOB' then '已配料' else '未配料' end) end as Status,
=======
case when sum(a.Quantity) =sum(IssueQuantity) then '已过账'
when sum(a.Quantity)!=sum(IssueQuantity) AND sum(IssueQuantity)>0 then '已配料'
else '未配料' end as Status,
>>>>>>> efc78f9c8baeef8cab1716c8a0f5c91ac1b873d8
f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 , 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.cFree4 ,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10,
case when a.MUSER!= 'JOB' then a.MUSER else '' end AS PickName case when a.MUSER!= 'JOB' then a.MUSER else '' end AS PickName
@ -603,7 +609,10 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
else '已合并' else '已合并'
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,
f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1,
case when sum(a.Quantity) =sum(IssueQuantity) then '已过账'
when sum(a.Quantity)!=sum(IssueQuantity) AND sum(IssueQuantity)>0 then '已配料'
else '未配料' end as Status,
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,a.ID f.cFree2,f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10,a.ID
from ICSOApply a from ICSOApply a
left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint
@ -796,6 +805,9 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
a.CusCode,a.CusName, a.CusCode,a.CusName,
(CASE WHEN max(e.SourceID) IS NULL THEN '未合并' ELSE '已合并' END) AS IsNew, (CASE WHEN max(e.SourceID) IS NULL THEN '未合并' ELSE '已合并' 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(SDNQuantity) then '已过账'
when sum(a.Quantity)!=sum(SDNQuantity) AND sum(SDNQuantity)>0 then '已配料'
else '未配料' end as Status,
f.Colspan, f.ProjectCode, f.BatchCode, f.Version, f.Brand, 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,a.ID f.cFree1, f.cFree2, f.cFree3, f.cFree4, f.cFree5, f.cFree6, f.cFree7, f.cFree8, f.cFree9, f.cFree10,a.ID
FROM ICSSDN a FROM ICSSDN a
@ -927,6 +939,9 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
else '已合并' else '已合并'
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.OutQuantity) then '已过帐'
when sum(a.Quantity)!=sum(a.OutQuantity) and sum(a.OutQuantity)>0 then '已配料'
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,a.ID f.cFree2,f.cFree3,f.cFree4,f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10,a.ID
from ICSOtherOut a from ICSOtherOut a
@ -1117,6 +1132,9 @@ f.Colspan,f.ProjectCode,f.BatchCode,f.Version,f.Brand,f.cFree1,
else '已合并' else '已合并'
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 '已过帐'
when sum(a.Quantity)!=sum(a.TransferQuantity) and a.TransferQuantity>0 then '已配料'
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
from ICSTransfer a from ICSTransfer a
@ -1154,7 +1172,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
} }
sqlString.Append(@"group by a.TransferNO,a.CreateDateTime,a.CreatePerson,f.Colspan,f.ProjectCode, sqlString.Append(@"group by a.TransferNO,a.CreateDateTime,a.CreatePerson,f.Colspan,f.ProjectCode,
f.BatchCode,f.Version,f.Brand,f.cFree1,f.cFree2,f.cFree3,f.cFree4, 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,a.ID) t where t.row=1");
f.cFree5,f.cFree6,f.cFree7,f.cFree8,f.cFree9,f.cFree10,a.ID,a.TransferQuantity) t where t.row=1");
#endregion #endregion
return Repository().FindTablePageBySql(sqlString.ToString(), parameter.ToArray(), ref jqgridparam); return Repository().FindTablePageBySql(sqlString.ToString(), parameter.ToArray(), ref jqgridparam);
@ -1900,6 +1918,8 @@ c.Sequence,
} }
} }
try try
{
if (table.Rows.Count != 0)
{ {
#region 拣料时增加条码出入库记录,修改库存锁定数量,以作占料处理 #region 拣料时增加条码出入库记录,修改库存锁定数量,以作占料处理
string BusinessCode = string.Empty; string BusinessCode = string.Empty;
@ -2022,6 +2042,7 @@ c.Sequence,
SqlHelper.CmdExecuteNonQueryLi(pikTbLogsql); SqlHelper.CmdExecuteNonQueryLi(pikTbLogsql);
#endregion #endregion
}
var result = ConvertCellToString(table); var result = ConvertCellToString(table);
if (Invmes.Rows.Count > 0) if (Invmes.Rows.Count > 0)

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

@ -64,14 +64,15 @@
//cols.push(collast); //cols.push(collast);
var collast = { label: '拣料人姓名', name: 'PickName', width: 100, align: 'left' }; var collast = { label: '拣料人姓名', name: 'PickName', width: 100, align: 'left' };
cols.push(collast); cols.push(collast);
var collast = { label: '收料人姓名', name: 'ReceiverName', width: 150, align: 'left' };
cols.push(collast);
var collast = { label: '需求日期', name: 'NeedDate', width: 120, align: 'left' }; var collast = { label: '需求日期', name: 'NeedDate', width: 120, align: 'left' };
cols.push(collast); cols.push(collast);
var collast = { label: '需求时间', name: 'NeedTime', width: 120, align: 'left', }; var collast = { label: '需求时间', name: 'NeedTime', width: 120, align: 'left', };
cols.push(collast); cols.push(collast);
//var collast = { label: '收料人工号', name: 'ReceiverNumber', width: 150, align: 'left' }; //var collast = { label: '收料人工号', name: 'ReceiverNumber', width: 150, align: 'left' };
//cols.push(collast); //cols.push(collast);
var collast = { label: '收料人姓名', name: 'ReceiverName', width: 150, align: 'left' };
cols.push(collast);
var collast = { label: '紧急程度', name: 'Urgency', width: 120, align: 'left', }; var collast = { label: '紧急程度', name: 'Urgency', width: 120, align: 'left', };
cols.push(collast); cols.push(collast);
var collast = { label: '调度人姓名', name: 'DispatcherName', width: 120, align: 'left' }; var collast = { label: '调度人姓名', name: 'DispatcherName', width: 120, align: 'left' };

Write Preview
Loading…
Cancel
Save