Browse Source

新增是否过账筛选条件

master
lilili 2 years ago
parent
commit
48e70f252c
  1. 7
      WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
  2. 17
      WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/GXWXCallSAP.cshtml

7
WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs

@ -1052,6 +1052,7 @@ where a.Status='2'";
{
sql += " and f.BatchCode like '%" + queryParam["BatchCode"].ToString() + "%' ";
}
}
if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin")
{
@ -1061,6 +1062,12 @@ where a.Status='2'";
{
sql += " and a.VenCode='" + NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode + "'";
}
if (!string.IsNullOrWhiteSpace(queryParam["SAPMark"].ToString()))
{
sql = $@"select * from ({sql}) c where c.SAPMark='{queryParam["SAPMark"]}' ";
}
return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam);
}

17
WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/GXWXCallSAP.cshtml

@ -124,7 +124,8 @@
InvName: $("#txt_InvName").val(),
BatchCode: $("#txt_BatchCode").val(),
Container: $("#txt_Container :checked").val(),
DNID: $("#txt_DNID").val()
DNID: $("#txt_DNID").val(),
SAPMark: $("#txt_Post :checked").val()
}
$gridList.dataGrid({
url: "/WMS/WMSCreateItemLot/GetGridJsonGXWX" + "?" + Math.random(),
@ -179,7 +180,8 @@
InvName: $("#txt_InvName").val(),
BatchCode: $("#txt_BatchCode").val(),
Container: $("#txt_Container :checked").val(),
DNID: $("#txt_DNID").val()
DNID: $("#txt_DNID").val(),
SAPMark: $("#txt_Post :checked").val()
}
$gridList.jqGrid('setGridParam', {
postData: { queryJson: JSON.stringify(queryJson) },
@ -433,6 +435,17 @@
</div>
</td>
<td>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;是否过账:</label>
</td>
<td>
<div class="input-group" id="txt_Post">
<input type="radio" name="post" value="是" />&nbsp;是
<input type="radio" name="post" checked="checked" value="否" />&nbsp;否
</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>

Loading…
Cancel
Save