From fd7b2deaaded8b6c56b082e9d64fed008e685c25 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 29 Jun 2023 09:22:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E6=9B=B4=E8=BD=BD=E5=85=B7=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs index bb11970a..bde47097 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs @@ -338,7 +338,8 @@ namespace Tnb.WarehouseMgr await _db.Updateable().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync(); //如果是自动单据，需要回更上层系统 } - else { + else + { //如果没有完成，修改为工作中 await _db.Updateable().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync(); } @@ -411,11 +412,15 @@ namespace Tnb.WarehouseMgr } if (dicUpdate.Count > 0) { + //var dicCarryCodes = carryCodes.FindAll(x => dicUpdate.Keys.Contains(x.barcode)).GroupBy(g => g.barcode).ToDictionary(x => x.Key, x => x.FirstOrDefault()); foreach (var pair in dicUpdate) { - WmsCarryCode carryCode = new(); - carryCode.codeqty = pair.Value; - await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).Where(it => it.barcode == pair.Key).ExecuteCommandAsync(); + WmsCarryCode carryCode = carryCodes.Find(x => x.barcode == pair.Key); + if (carryCode != null) + { + carryCode.codeqty = pair.Value; + await _db.Updateable(carryCode).UpdateColumns(it => it.codeqty).ExecuteCommandAsync(); + } } await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync(); await _db.Deleteable().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync(); From 835e16a47f1ad395bf9d173bb5c29370f9ae3daf Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 29 Jun 2023 09:22:19 +0800 Subject: [PATCH 2/4] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs index bde47097..cb297a26 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs @@ -412,10 +412,9 @@ namespace Tnb.WarehouseMgr } if (dicUpdate.Count > 0) { - //var dicCarryCodes = carryCodes.FindAll(x => dicUpdate.Keys.Contains(x.barcode)).GroupBy(g => g.barcode).ToDictionary(x => x.Key, x => x.FirstOrDefault()); foreach (var pair in dicUpdate) { - WmsCarryCode carryCode = carryCodes.Find(x => x.barcode == pair.Key); + WmsCarryCode? carryCode = carryCodes.Find(x => x.barcode == pair.Key); if (carryCode != null) { carryCode.codeqty = pair.Value; From d47c4f80ed6afd92649d47da0c76ba85723979a7 Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 29 Jun 2023 10:24:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4WmsCarryCode=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs index f9e9fd96..07d58f64 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs @@ -49,11 +49,6 @@ public partial class WmsCarryCode : BaseEntity, IWmsCarryEntity /// public decimal codeqty { get; set; } - /// - /// 行号 - /// - public int no { get; set; } - /// /// 是否出库 /// From 195dfa73aad4fe3a98792f58aa708e237ef9f5d2 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 29 Jun 2023 13:56:08 +0800 Subject: [PATCH 4/4] 1 --- WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs index d71a69a9..0a8b4a4c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs @@ -36,7 +36,7 @@ namespace Tnb.WarehouseMgr } } } - + [NonAction] protected async Task DoUpdate(WareHouseUpInput input) { if (_stroageMap.ContainsKey(input.loginType)) @@ -44,7 +44,7 @@ namespace Tnb.WarehouseMgr await _stroageMap[input.loginType].Do(input); } } - + [NonAction] public virtual Task ModifyAsync(WareHouseUpInput input) { return Task.CompletedTask;