diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs index c801641..b435977 100644 --- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs +++ b/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); } diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/GXWXCallSAP.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/GXWXCallSAP.cshtml index 1d86ed8..0cf267b 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/GXWXCallSAP.cshtml +++ b/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) }, @@ -406,11 +408,11 @@ @*: - -
- -
- *@ + +
+ +
+ *@ : @@ -433,6 +435,17 @@ + + + + + +
+  是 +  否 +
+ +