盘点签收接口逻辑代码调整

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -265,7 +265,25 @@
         /// 盘点任务计算状态-未结算
         /// </summary>
         public const string CLOSINGSTATUS_WJS_ID = "27674058079509";
-
+        /// <summary>
-        
+        /// 盘点任务计算状态-盘亏
+        /// </summary>
+        public const string CLOSINGSTATUS_PK_ID = "27674064284949";
+        /// <summary>
+        /// 盘点任务计算状态-正常
+        /// </summary>
+        public const string CLOSINGSTATUS_NORMAL_ID = "27674060155413";
+        /// <summary>
+        /// 盘点任务计算状态-盘盈
+        /// </summary>
+        public const string CLOSINGSTATUS_PY_ID = "27674069224213";
+        /// <summary>
+        /// 盘点状态-盘点中
+        /// </summary>
+        public const string CHECKSTATUS_PDZ_ID = "27584592425493";
+        /// <summary>
+        /// 盘点状态-盘点结账
+        /// </summary>
+        public const string CHECKSTATUS_PDJZ_ID = "27584597303317";
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TakeStockSignInput.cs

@@ -11,6 +11,9 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
     /// </summary>
     public class TakeStockSignInput
     {
+        /// <summary>
+        /// 盘点任务明细列表
+        /// </summary>
         public List<WmsCheckstockCode> details{ get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs

@@ -440,9 +440,17 @@ namespace Tnb.WarehouseMgr
                   .ToListAsync();
             return items;
         }
-
+        /// <summary>
+        /// 盘点签收
+        /// </summary>
+        /// <param name="input">盘点签收输入参数</param>
+        /// <returns>有异常信息为失败，无异常为正常</returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="AppFriendlyException"></exception>
+        [HttpPost]
         public async Task TakeStockSign(TakeStockSignInput input)
         {
+
             if (input == null) throw new ArgumentNullException("input");
             if (input.details == null) throw new ArgumentNullException(nameof(input.details));
             var checkStockCodes = input.details.Adapt<List<WmsCheckstockCode>>();
@@ -452,6 +460,10 @@ namespace Tnb.WarehouseMgr
                                                        it.status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID &&
                                                        it.is_sign == 0).FirstAsync();
 
+            try
+            {
+                await _db.Ado.BeginTranAsync();
+
                 if (disTask != null)
                 {
                     disTask.is_sign = 1;
@@ -460,7 +472,7 @@ namespace Tnb.WarehouseMgr
                 var checkStock = await _db.Queryable<WmsCheckstockH>().SingleAsync(it => it.id == checkStockCodes[0].checkstock_id);
                 if (checkStock != null)
                 {
-                InStockStrategyQuery q = new() { warehouse_id = checkStock.warehouse_id };
+                    InStockStrategyQuery q = new() { warehouse_id = checkStock!.warehouse_id! };
                     var endLocs = await _warehouseService.InStockStrategy(q);
                     WmsPointH? sPoint = null, ePoint = null;
                     var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == checkStockCodes[0].carry_id);
@@ -501,8 +513,8 @@ namespace Tnb.WarehouseMgr
                                 status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
                                 biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID,
                                 task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID,
-                            carry_id = carry?.id,
+                                carry_id = carry?.id ?? string.Empty,
-                            carry_code = carry?.carry_code,
+                                carry_code = carry?.carry_code ?? string.Empty,
                                 area_id = sPoint?.area_id!,
                                 area_code = it.Key,
                                 create_id = _userManager.UserId,
@@ -526,11 +538,11 @@ namespace Tnb.WarehouseMgr
                             WmsHandleH handleH = new()
                             {
                                 org_id = _userManager.User.OrganizeId,
-                            startlocation_id = carry.location_id,
+                                startlocation_id = carry?.location_id ?? string.Empty,
                                 endlocation_id = endLocs?[0].id ?? string.Empty,
                                 bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_CARRYMOINSTK_ENCODE).GetAwaiter().GetResult(),
                                 biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID,
-                            carry_id = checkStockCodes[0].carry_id,
+                                carry_id = checkStockCodes?[0].carry_id ?? string.Empty,
                                 carry_code = carry?.carry_code ?? string.Empty,
                                 create_id = _userManager.UserId,
                                 create_time = DateTime.Now
@@ -546,7 +558,7 @@ namespace Tnb.WarehouseMgr
                     }
                 }
 
-            foreach (var csCode in checkStockCodes)
+                foreach (var csCode in checkStockCodes!)
                 {
                     csCode.id = SnowflakeIdHelper.NextId();
                     var checkStockPartDs = await _db.Queryable<WmsCheckstockD>().Where(it => it.checkstock_id == csCode.checkstock_id).ToListAsync();
@@ -556,10 +568,54 @@ namespace Tnb.WarehouseMgr
                 //插入 盘点code表
                 await _db.Insertable(checkStockCodes).ExecuteCommandAsync();
                 var detailIds = checkStockCodes.Select(x => x.checkstock_d_id).ToList();
-            var checkStockDs = _db.Queryable<WmsCheckstockD>().Where(it => detailIds.Contains(it.id)).ToListAsync();
+                var checkStockDs = await _db.Queryable<WmsCheckstockD>().Where(it => detailIds.Contains(it.id)).ToListAsync();
-            foreach (var csCode in checkStockCodes)
+                foreach (var csd in checkStockDs)
                 {
 
+                    var csCode = checkStockCodes.Find(x => x.checkstock_d_id == csd.id);
+                    if (csCode != null)
+                    {
+                        csd.qty += csCode.codeqty;
+                        var residueQty = csd.qty - csd.pr_qty;
+                        if (residueQty == 0)
+                        {
+                            csd.closing_status = WmsWareHouseConst.CLOSINGSTATUS_NORMAL_ID;
+                        }
+                        else if (residueQty > 0)
+                        {
+                            csd.closing_status = WmsWareHouseConst.CLOSINGSTATUS_PY_ID;
+                        }
+                        else if (residueQty < 0)
+                        {
+                            csd.closing_status = WmsWareHouseConst.CLOSINGSTATUS_PK_ID;
+                        }
+                    }
+                }
+                _ = await _db.Updateable(checkStockDs).UpdateColumns(it => new { it.qty, it.closing_status }).ExecuteCommandAsync();
+                var checkStockDsGrp = checkStockDs.GroupBy(g => g.checkstock_id);
+                var checkStocks = await _db.Queryable<WmsCheckstockH>().Where(it => checkStockDsGrp.Select(g => g.Key).Contains(it.id)).ToListAsync();
+                var tasks = new List<Task<int>>(checkStockDsGrp.Count());
+                foreach (var grp in checkStockDsGrp)
+                {
+                    if (grp.All(x => x.closing_status != WmsWareHouseConst.CLOSINGSTATUS_WJS_ID))
+                    {
+                        var cs = checkStocks.Find(x => x.id == grp.Key);
+                        if (cs != null)
+                        {
+                            cs.status = WmsWareHouseConst.CHECKSTATUS_PDJZ_ID;
+                            tasks.Add(_db.Updateable(cs).UpdateColumns(it => it.status).ExecuteCommandAsync());
+                        }
+                    }
+                }
+                _ = await Task.WhenAll(tasks);
+
+                await _db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.Error("盘点签收失败", ex);
+                await _db.Ado.RollbackTranAsync();
+                throw;
             }
         }