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

调整拣料显示的页面和接口

master
lilili 2 years ago
parent
fab69cf061
commit
8d7da562ec
2 changed files with 35 additions and 3 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. 6
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  2. 32
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

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

@ -121,6 +121,8 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
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,
case when max(e.SourceID) is null then '未合并' else '已合并' end as IsNew,f.Colspan ,
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,
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
from ICSMOApply a
@ -149,10 +151,10 @@ where b.MOCode='{0}' and a.WorkPoint='{1}'";
}
}
sqlString.Append(@" group by a.ApplyCode, a.WorkPoint,a.CreateDateTime,a.createperson,
sqlString.Append(@" group by a.ApplyCode, a.WorkPoint,a.IssueQuantity,a.CreateDateTime,a.createperson,
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.WHCode,detail.LocationCode,a.ID,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) as t where t.row=1");
a.ReceiverNumber,a.ReceiverName,a.Urgency,a.NeedDate,a.NeedTime,a.RemarksTerm,a.TextNumber,a.InvDescribe,a.Unit,a.StockIndicator,a.MUSERName) as t where t.row=1");
#endregion

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

@ -85,6 +85,8 @@
function SetCols() {
var Type = $("#selShow").val();
var ct = document.getElementsByClassName("type7");
var cols = new Array();
var collast = { label: "主键", name: "ID", hidden: true, key: true };
@ -129,15 +131,25 @@
cols.push(collast);
var collast = { label: '销售凭证项号', name: 'Brand', width: 100, align: 'left' };
cols.push(collast);
/* ct.style.display = "none";*/
//ct1.style.display = "none";
//ct2.style.display = "none";
//ct3.style.display = "none";
}
else
{
var collast = { label: '客户编码', name: 'CusCode', width: 150, align: 'left' };
cols.push(collast);
var collast = { label: '客户名称', name: 'CusName', width: 150, align: 'left' };
cols.push(collast);
}
if (Type = 2)
{
var collast = { label: '状态', name: 'Status', width: 150, align: 'left' };
cols.push(collast);
}
$.ajax({
@ -178,6 +190,8 @@
InvCode: $("#txt_InvCode").val(),
Area: $("#txt_Area").val(),
WHCode: $("#txt_WHCode").val(),
CusCode: $("#txt_CusCode").val(),
CusName: $("#txt_CusName").val()
}
$gridList.dataGrid({
@ -404,6 +418,8 @@
InvCode: $("#txt_InvCode").val(),
Area: $("#txt_Area").val(),
WHCode: $("#txt_WHCode").val(),
CusCode: $("#txt_CusCode").val(),
CusName: $("#txt_CusName").val()
}
$gridList.jqGrid('setGridParam', {
postData: { queryJson: JSON.stringify(queryJson) },
@ -691,7 +707,7 @@
</script>
<div class="topPanel" style="height:120px;">
<div class="topPanel" style="height:150px;">
<div class="toolbar">
<div class="btn-group">
<a id="NF-Material" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnMaterial()"><i class="fa fa-pencil-square-o"></i>拣料</a>
@ -755,6 +771,20 @@
</div>
</td>
<td style="text-align:left;" class="type7" ><label class="lglabel" for="txt_POCode" >&nbsp;&nbsp;&nbsp;客户编码</label>：</td>
<td class="type7" >
<div class="input-group">
<input id="txt_CusCode" type="text" class="form-control" style="width: 150px; ">
</div>
</td>
<td style="text-align: right; " class="type7" ><label class="lglabel" for="txt_InvCode">&nbsp;&nbsp;&nbsp;客户名称</label>：</td>
<td class="type7" >
<div class="input-group">
<input id="txt_CusName" type="text" class="form-control" style="width: 150px;">
</div>
</td>
<td>
<span class="input-group-btn">
<button id="btn_search" type="button" class="btn btn-primary"><i class="fa fa-search"></i></button>

Write Preview
Loading…
Cancel
Save