退料任务数量卡控

wms.service/Service/FJService.cs

@@ -1559,7 +1559,16 @@ namespace wms.service.Service
         {
             var res = new SRes { ResCode = ResponseStatusCodeEnum.Fail.GetHashCode(), ResMsg = "失败" };
 
-            //获取工字轮任务信息
+            var taskMaxNum = Convert.ToInt32(_sysconfigrepository.AsQueryable().With(SqlWith.NoLock)
+                .First(x => x.Code == "CRBackNum").SContent);
+            var taskNum = _taskrepository.AsQueryable().With(SqlWith.NoLock)
+                .Count(x => x.BusType == FJTaskBusType.帘线退料重绕.GetDescription() && x.Status < TaskStatus.Finish);
+            if (taskMaxNum > 0 && taskMaxNum <= taskNum)
+            {
+                res.ResCode = ResponseStatusCodeEnum.Fail.GetHashCode();
+                res.ResMsg = $"任务数量已达{taskNum},请稍后再操作！！！！！！";
+                return res;
+            }
             var taskInfo = _taskrepository.AsQueryable().With(SqlWith.NoLock)
                 .First(x => x.BarCode == reqDto.TrayCode && x.Status < TaskStatus.Finish);
             if (taskInfo != null)
@@ -7149,7 +7158,7 @@ namespace wms.service.Service
             {
                 var well = _basewarecellrepository.GetSingle(x =>
                     x.ContGrpBarCode == wcstask.BarCode && x.Code.Contains(wcstask.AddrFrom) &&
-                    x.WarehouseCode == wcstask.WarehouseCode);
+                    (x.WarehouseCode == wcstask.WarehouseCode || wcstask.Device == "CR"));
                 if (well == null)
                 {
                     result.ResCode = ResponseStatusCodeEnum.Sucess.GetHashCode();
@@ -7222,7 +7231,7 @@ namespace wms.service.Service
                         GroupID = 0, XYNO = 0
                     },
                     p => p.ContGrpBarCode == wcstask.BarCode && p.Code.Contains(wcstask.AddrFrom) &&
-                         p.WarehouseCode == wcstask.WarehouseCode);
+                         (p.WarehouseCode == wcstask.WarehouseCode || wcstask.Device == "CR"));
                 _billInvflow.InsertRange(flowlist);
                 _db.CommitTran();
             }
@@ -7630,7 +7639,7 @@ namespace wms.service.Service
                                         EditTime = DateTime.Now
                                     },
                                     p => p.StateNum == FjLocationState.StockOut && p.ContGrpBarCode == task.BarCode &&
-                                         p.Code.Contains(task.AddrFrom) && p.WarehouseCode == task.WarehouseCode);
+                                         p.Code.Contains(task.AddrFrom) && (p.WarehouseCode == task.WarehouseCode || task.Device == "CR"));
 
                                 //更新流水信息
                                 _billInvflow.InsertRange(flowlist);