Merge remote-tracking branch 'origin/dev' into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs

@@ -49,11 +49,6 @@ public partial class WmsCarryCode : BaseEntity<string>, IWmsCarryEntity
     /// </summary>
     public decimal codeqty { get; set; }
 
-    /// <summary>
-    /// 行号
-    /// </summary>
-    public int no { get; set; }
-
     /// <summary>
     /// 是否出库
     /// </summary>

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;

WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs

@@ -338,7 +338,8 @@ namespace Tnb.WarehouseMgr
                             await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
                             //如果是自动单据，需要回更上层系统
                         }
-                        else {
+                        else
+                        {
                             //如果没有完成，修改为工作中
                             await _db.Updateable<WmsOutstockH>().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
                         }
@@ -413,9 +414,12 @@ namespace Tnb.WarehouseMgr
                             {
                                 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<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.正常).ToString() }).Where(it => input.carryIds.Contains(it.id)).ExecuteCommandAsync();
                                 await _db.Deleteable<WmsCarryMat>().Where(it => input.carryIds.Contains(it.carry_id)).ExecuteCommandAsync();