多仓:wcs调试

周鸿
1 parent df8e6108
Showing 3 changed files with 10 additions and 6 deletions
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java
@@ -152,7 +152,12 @@ public class TaskHeaderController extends BaseController {
         AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
             @Override
             public AjaxResult doProcess() {
-                AjaxResult ajaxResult = taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId));
+                AjaxResult ajaxResult =null;
+                try{
+                    ajaxResult = taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId));
+                }catch (Exception e){
+                    ajaxResult=AjaxResult.error(e.getMessage());
+                }
                 return ajaxResult;
             }
         });
@@ -375,11 +375,7 @@ public class TaskHeaderService  extends ServiceImpl&lt;TaskHeaderMapper, TaskHeader
                 case "LK":
                     //立库考虑双伸位问题，外部库位挡住内部库位
                     if(task.getWarehouseCode().equals(QuantityConstant.WAREHOUSE_KS)&&100!=(task.getTaskType()) && 500!=task.getTaskType()) {
-                        try{
-                            transferTaskService.doubletransfer(task);
-                        }catch (Exception e){
-                            return AjaxResult.error(e.getMessage());
-                        }
+                        transferTaskService.doubletransfer(task);
                     }
                     ajaxResult=taskAssignService.wcsTaskAssign(task);
                     if (ajaxResult != null && ajaxResult.hasErr()) {
@@ -340,6 +340,9 @@ public class TransferTaskService {
                 if(loca == null){
                     throw new ServiceException("外侧库位在系统不存在");
                 }
+                if(loca.getStatus().equals("lock")){
+                    throw new ServiceException("外侧库位已有任务被锁住");
+                }
  
                 if(loca.getStatus().equals("lock") && StringUtils.isNotEmpty(loca.getUserDef1()) && loca.getUserDef1().equals("1")){
                     throw new ServiceException(task.getContainerCode() + "此托盘外部库位有进库任务,请等待下发");