Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/ZT-FJ-WMS

wms.api/Controllers/FjController.cs

@@ -416,7 +416,7 @@ namespace wms.api.Controllers
         /// </summary>
         /// <param name="reqDto"></param>
         /// <returns></returns>
-        [HttpPost(Name = "QueryFlowDirectionExceptions")]
+        [HttpPost]
         public SRes QueryFlowDirectionExceptions(GetFlowExceptionResultsRequest reqDto)
         {
             return _fjService.QueryFlowDirectionExceptions(reqDto);
@@ -837,6 +837,7 @@ namespace wms.api.Controllers
         /// </summary>
         /// <param name="reqEntity"></param>
         /// <returns></returns>
+        [HttpPost]
         public SRes<FJApplyStockInLocResponse> FindAvailableFlatStorageSlot(FJApplyStockInLocRequest reqDto)
         {
             return ConcurrencyReqControl<FJApplyStockInLocRequest, SRes<FJApplyStockInLocResponse>>(lockFindAvailableFlatStorageSlot, "FindAvailableFlatStorageSlot" + reqDto.PickUpEquipmentNo, reqDto.PickUpEquipmentNo, reqDto, _fjService.FindAvailableFlatStorageSlot);

wms.service/Service/FJService.cs

@@ -782,7 +782,7 @@ namespace wms.service.Service
             var res = new SRes();
 
             //时间处理
-            var prodate = reqDto.ProductDate.GetDateTime(_logger);
+            var prodate = reqDto.ProductDate.GetDateTime(_logger).AddMinutes(-1);
 
             //是否有异常
             if (_baseErrorInfoRepository.AsQueryable().With(SqlWith.NoLock)
@@ -793,7 +793,7 @@ namespace wms.service.Service
                 if (regInfo != null) //表示此工字轮注册时失败
                 {
                     res.ResCode = ResponseStatusCodeEnum.Sucess.GetHashCode();
-                    res.ResMsg = regInfo.Message + $"[{prodate:yyyy-MM-dd hh:mm:ss}]";
+                    res.ResMsg = regInfo.Message + $"[{reqDto.ProductDate}]";
                     return res;
                 }
 
@@ -803,7 +803,7 @@ namespace wms.service.Service
                 if (flow != null) //表示此工字轮获取流向时出现的错误结果
                 {
                     res.ResCode = ResponseStatusCodeEnum.Sucess.GetHashCode();
-                    res.ResMsg = flow.Message + $"[{prodate:yyyy-MM-dd hh:mm:ss}]";
+                    res.ResMsg = flow.Message + $"[{reqDto.ProductDate}]";
                     return res;
                 }
             }
@@ -7235,9 +7235,9 @@ namespace wms.service.Service
             //检查历史任务表是否有任务
             var task = _wcstaskoldrepository.AsQueryable().With(SqlWith.NoLock)
                 .Where(p => p.Id == reqDto.TaskNum).SplitTable(tabs => tabs.Take(2)).First();
-            var isBackRewind = _wcstaskoldrepository.AsQueryable().With("WITH(READPAST,ROWLOCK)")
+            var isBackRewind = _wcstaskoldrepository.AsQueryable().With(SqlWith.NoLock)
                 .Where(p => p.Id == reqDto.TaskNum && p.BusType == FJTaskBusType.帘线退料重绕.GetDescription()).SplitTable(tabs => tabs.Take(2)).Any();
-            var isRewindIn = _wcstaskoldrepository.AsQueryable().With("WITH(READPAST,ROWLOCK)")
+            var isRewindIn = _wcstaskoldrepository.AsQueryable().With(SqlWith.NoLock)
                 .Where(p => p.Id == reqDto.TaskNum && p.BusType == FJTaskBusType.重绕满托入库.GetDescription()).SplitTable(tabs => tabs.Take(2)).Any();
             if (task == null)
             {