wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跨层与采购退货其他出库逻辑变更

Browse Source
This commit is contained in:
马健
2024-09-20 16:48:19 +08:00
parent adc18cebd6
commit 4355b3f7a5
4 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
View File

@@ -36,6 +36,7 @@ namespace Tnb.WarehouseMgr
[HttpPost, AllowAnonymous]
public async Task<dynamic> MaterialStock(VisualDevModelListQueryInput input)
{
var warehouse_id = "";
var supplier_code = "";
var code_batch = "";
var material_specification = "";
@@ -43,6 +44,7 @@ namespace Tnb.WarehouseMgr
var material_code = "";
if (!input.queryJson.IsNullOrWhiteSpace())
{
warehouse_id = JObject.Parse(input.queryJson).Value<string>("warehouse_id");
supplier_code = JObject.Parse(input.queryJson).Value<string>("supplier_code");
code_batch = JObject.Parse(input.queryJson).Value<string>(nameof(WmsCarryCode.code_batch));
material_specification = JObject.Parse(input.queryJson).Value<string>(nameof(WmsCarryCode.material_specification));
@@ -63,6 +65,7 @@ namespace Tnb.WarehouseMgr
.WhereIF(!string.IsNullOrEmpty(code_batch), (a, b, c, d, e, f) => a.code_batch.Contains(code_batch))
.WhereIF(!string.IsNullOrEmpty(container_no), (a, b, c, d, e, f) => f.container_no.Contains(container_no))
.WhereIF(!string.IsNullOrEmpty(material_code), (a, b, c, d, e, f) => f.code.Contains(material_code))
.WhereIF(!string.IsNullOrEmpty(warehouse_id), (a, b, c, d, e, f) => c.wh_id == warehouse_id)
.Select((a, b, c, d, e, f, g, h) => new WmsStockReportH
{
org_id = e.org_id,
@@ -127,6 +130,7 @@ namespace Tnb.WarehouseMgr
.WhereIF(!string.IsNullOrEmpty(supplier_code), (a, b, c, d, e, f, g, h) => h.supplier_code.Contains(supplier_code))
.WhereIF(!string.IsNullOrEmpty(container_no), (a, b, c, d, e, f, g, h) => f.container_no.Contains(container_no))
.WhereIF(!string.IsNullOrEmpty(material_code), (a, b, c, d, e, f) => f.code.Contains(material_code))
.WhereIF(!string.IsNullOrEmpty(warehouse_id), (a, b, c, d, e, f) => c.wh_id == warehouse_id)
.Select((a, b, c, d, e, f, g, h) => new WmsStockReportH
{
org_id = e.org_id,