From f5c0e0e41f543d20a6dcf786d0cdeef518809ddc Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 8 Oct 2024 10:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=8D=95=E6=8D=AE=E8=A1=8C?= =?UTF-8?q?=E5=8F=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs | 4 +++- .../Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs | 2 +- .../Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index c8d2175b..593b275f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -320,7 +320,7 @@ namespace Tnb.WarehouseMgr instock!.sync_status = callBackRes == true ? WmsWareHouseConst.SYNC_STATUS__SYNCCOMPLETE : WmsWareHouseConst.SYNC_STATUS__SYNCFAILED; _ = await _db.Updateable(instock).UpdateColumns(it => it.sync_status).ExecuteCommandAsync(); } - List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); + List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).OrderBy(x=>x.id).ToListAsync(); if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID)) { instock.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index aca83463..1fe93137 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -375,7 +375,7 @@ namespace Tnb.WarehouseMgr } - List allInstockDetails = await _db.Queryable().Where(it => it.prd_instockD_id == wmsPrdInstockD.id).ToListAsync(); + List allInstockDetails = await _db.Queryable().Where(it => it.prd_instockD_id == wmsPrdInstockD.id).OrderBy(x=>x.id).ToListAsync(); List materialIds = Arrays.AsList(instock.material_id); List unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs index 34c5c0c6..2a5e2c3a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs @@ -122,7 +122,7 @@ namespace Tnb.WarehouseMgr // 托盘对应入库单 List instock_mains = await _db.Queryable().Where(x => x.source_id == wmsPurchaseD.bill_id).ToListAsync(); - List allInstockDetails = await _db.Queryable().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).ToListAsync(); + List allInstockDetails = await _db.Queryable().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).OrderBy(x=>x.id).ToListAsync(); List> requestData = new List>(); List carryIds = instock_mains.Select(x => x.carry_id).ToList(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs index a93c5dbc..0670ea75 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs @@ -87,6 +87,7 @@ namespace Tnb.WarehouseMgr WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable().SingleAsync(x=>x.id==input.source_id); WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable().SingleAsync(x=>x.id==wmsRawmatOutstockD.bill_id); + List wmsRawmatOutstockDs = await _db.Queryable().Where(x=>x.bill_id==wmsRawmatOutstockH.id).OrderBy(x=>x.id).ToListAsync(); List wmsCarryCodes = await _db.Queryable() .Where(r => r.carry_id == input.wmsDistaskH.carry_id) .Where(r => r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno) @@ -160,6 +161,7 @@ namespace Tnb.WarehouseMgr List> erpRequestDataDetails = new List>(); foreach(var item in wmsCarryCodes) { + int lineno = (wmsRawmatOutstockDs.FindIndex(x => x.id == wmsRawmatOutstockD.id) + 1) * 10; // 出库数量wmsMaterialSignD.sign_qty erpRequestDataDetails.Add(new Dictionary() { @@ -169,7 +171,7 @@ namespace Tnb.WarehouseMgr ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", ["corpoid"] = erpOrg.corpoid, ["corpvid"] = erpOrg.corpvid, - ["crowno"] = wmsRawmatOutstockD.lineno, + ["crowno"] = wmsRawmatOutstockD.lineno ?? lineno.ToString(), ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cvendorid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_id, ["cvendorvid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_vid, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index ca42dae1..031cca88 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -91,7 +91,7 @@ namespace Tnb.WarehouseMgr .Where(it => it.id == input.wmsDistaskH.source_id).ExecuteCommandHasChangeAsync(); WmsInstockH instock = await _db.Queryable().SingleAsync(x => x.id == input.requireId); - List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); + List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).OrderBy(x=>x.id).ToListAsync(); string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? ""; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs index 51a26711..839446d0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs @@ -113,7 +113,7 @@ namespace Tnb.WarehouseMgr } WmsSterilizationInstockH wmsRawmatTransferoutstockH = await _db.Queryable().SingleAsync(x=>x.id==input.requireId); - List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.wmsDistaskH.carry_id).ToListAsync(); + List wmsCarryCodes = await _db.Queryable().Where(r => r.carry_id == input.wmsDistaskH.carry_id).OrderBy(x=>x.id).ToListAsync(); decimal qty = wmsCarryCodes.Sum(r => r.codeqty);