解决双伸位入库的一些问题

游杰
1 parent 7a0246fb
Showing 4 changed files with 15 additions and 4 deletions
src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/framework/web/controller/BaseController.java
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
@@ -43,7 +43,8 @@ public class WarecellAllocation extends BaseController {
         AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
             @Override
             public AjaxResult doProcess() {
-                return warecellAllocationService.warecellAllocation(wcsTask);
+                AjaxResult ajaxResult = warecellAllocationService.warecellAllocation(wcsTask);
+                return ajaxResult;
             }
         });
         return ajaxResult;
@@ -61,7 +62,13 @@ public class WarecellAllocation extends BaseController {
         wcsTask.setWidth(width);
         wcsTask.setHeight(height);
         wcsTask.setWeight(weight);
-        return warecellAllocationService.destinationAllocation(wcsTask);
+        AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
+            @Override
+            public AjaxResult doProcess() {
+                return warecellAllocationService.destinationAllocation(wcsTask);
+            }
+        });
+        return ajaxResult;
     }
@@ -129,6 +129,9 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
         List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambda);
         TaskHeader taskHeader = taskHeaderService.getById(wcsTask.getTaskNo());
+        if(taskHeader.getStatus() == 100) {
+            return AjaxResult.error("任务已经完成，不能再分库位");
+        }
         /* 循环查询入库组盘明细*/
         List<ReceiptContainerDetail> receiptContainerDetailList = new ArrayList<>();
@@ -207,7 +207,7 @@ public class BaseController
                     ajaxResult = multiProcessListener.doProcess();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    ajaxResult = AjaxResult.error("多线程处理异常");
+                    ajaxResult = AjaxResult.error(e.toString());
                 } finally {
                     semaphore.release(1);
                 }
@@ -343,7 +343,8 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         queryWrapper.eq(Location::getRowFlag, 0);
         queryWrapper.eq(Location::getContainerCode, "");
         queryWrapper.eq(Location::getLocationType, location.getLocationType());
-        Location location1 = getOne(queryWrapper);
+        List<Location> locationList = list(queryWrapper);
+        Location location1 = locationList.get(0);
         return location1;
     }