diff --git a/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java b/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java index e89d5d1..a43a5ea 100644 --- a/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java +++ b/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.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; } diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java index 83c8c69..0f27f8a 100644 --- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java +++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java @@ -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<>(); diff --git a/src/main/java/com/huaheng/framework/web/controller/BaseController.java b/src/main/java/com/huaheng/framework/web/controller/BaseController.java index 000eed5..a8e196f 100644 --- a/src/main/java/com/huaheng/framework/web/controller/BaseController.java +++ b/src/main/java/com/huaheng/framework/web/controller/BaseController.java @@ -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); } diff --git a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java index b77f586..e7884a4 100644 --- a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java +++ b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java @@ -343,7 +343,8 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> 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; }