1. 双伸位出库查看

2. fix 库区问题

1. 双伸位出库查看
2. fix 库区问题
游杰
1 parent e8ac79ea
Showing 8 changed files with 38 additions and 22 deletions
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/framework/aspectj/ApiLogAspect.java
src/main/java/com/huaheng/framework/config/ShiroConfig.java
src/main/java/com/huaheng/pc/config/zone/domain/Zone.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/config/zone/add.html
@@ -70,18 +70,18 @@ public class TaskAssignServiceImpl implements TaskAssignService {
         //1、判断taskHeader是否为空
         Integer preTaskNo = 0;
         if(taskHeader == null){
-            throw new ServiceException("wms任务为空");
+            return AjaxResult.error("wms任务为空");
         }
  
         //2、判断必填字段是否满足
         if(taskHeader.getId() == null){
-            throw new ServiceException("wms任务号Id为空");
+            return AjaxResult.error("wms任务号Id为空");
         }
         if(taskHeader.getTaskType() == null){
-            throw new ServiceException("wms任务类型为空");
+            return AjaxResult.error("wms任务类型为空");
         }
         if(StringUtils.isEmpty(taskHeader.getContainerCode())){
-            throw new ServiceException("wms任务中容器为空");
+            return AjaxResult.error("wms任务中容器为空");
         }
  
  
@@ -89,7 +89,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
         if(taskHeader.getTaskType()==100 || taskHeader.getTaskType()==200
                 || taskHeader.getTaskType()==500 || taskHeader.getTaskType()==800) {
             if (taskHeader.getFromLocation() == null) {
-                throw new ServiceException("源库位为空");
+                return AjaxResult.error("源库位为空");
             }
         }
  
@@ -99,7 +99,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
                 || taskHeader.getTaskType()==800 || taskHeader.getTaskType()==900)
         {
             if (taskHeader.getToLocation() == null) {
-                throw new ServiceException("目的库位为空");
+                return AjaxResult.error("目的库位为空");
             }
         }
  
@@ -121,7 +121,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
             location = locationService.findLocationByCode(taskHeader.getToLocation());
         }
  
-        if ("200".equals(wcsTask.getTaskType()) || "300".equals(wcsTask.getTaskType()) || "400".equals(wcsTask.getTaskType()) || "600".equals(wcsTask.getTaskType())) {
+        if ("200".equals(wcsTask.getTaskType()) || "300".equals(wcsTask.getTaskType()) || "400".equals(wcsTask.getTaskType()) || "600".equals(wcsTask.getTaskType()) || "900".equals(wcsTask.getTaskType())) {
             int rowFlag = location.getRowFlag().intValue();
             if(rowFlag == 1) {
                 Location insideLocation = locationService.getInsideNear(location);
@@ -136,12 +136,12 @@ public class TaskAssignServiceImpl implements TaskAssignService {
                     } else {
                         Location destinationLocation = locationService.getEmptyInsideLocation(insideLocation);
                         if (destinationLocation == null) {
-                            throw new ServiceException("移库没有剩余库位");
+                            return AjaxResult.error("移库没有剩余库位");
                         }
                         AjaxResult ajaxResult = transferTaskService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode());
                         preTaskNo = (Integer) ajaxResult.getData();
                         if (ajaxResult.hasErr()) {
-                            throw new ServiceException("创建移库任务失败");
+                            return AjaxResult.error("创建移库任务失败");
                         }
                         taskHeaderService.sendTaskToWcs(Convert.toIntArray(String.valueOf(preTaskNo)));
                     }
@@ -151,7 +151,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
                     lambdaWrapper.lt(TaskHeader::getStatus, 100);
                     TaskHeader taskHeader1 = taskHeaderService.getOne(lambdaWrapper);
                     if(taskHeader1 != null) {
-                        throw new ServiceException("执行外侧库位出库时，相应的内侧库位有任务，请先执行完内侧库位任务");
+                        return AjaxResult.error("执行外侧库位出库时，相应的内侧库位有任务，请先执行完内侧库位任务");
                     }
                 }
             }
@@ -167,10 +167,10 @@ public class TaskAssignServiceImpl implements TaskAssignService {
         lambdaWrapper.eq(TaskHeader::getFromLocation, nearLocationCode)
         .lt(TaskHeader::getStatus, 100)
         .in(TaskHeader::getTaskType, 200, 400 , 900)
-        .ge(TaskHeader::getStatus, 1);
+        .ge(TaskHeader::getStatus, 10);
         TaskHeader taskHeader2 = taskHeaderService.getOne(lambdaWrapper);
         if(taskHeader2 != null) {
-            throw new ServiceException("执行任务出库时，相应的旁边库位有分拣出库或者补充入库任务，请先执行完旁边库位任务");
+            return AjaxResult.error("执行任务出库时，相应的旁边库位有分拣出库或者补充入库任务，请先执行完旁边库位任务");
         }
  
         wcsTask.setPreTaskNo(String.valueOf(preTaskNo));
@@ -199,7 +199,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
         taskDetailLam.eq(TaskDetail::getTaskId,taskHeader.getId());
         List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLam);
         if(taskDetailList == null){
-            throw new ServiceException("没有子任务");
+            return AjaxResult.error("没有子任务");
         }
         List<TaskDetails> taskDetails =new ArrayList<>();
         for(TaskDetail item : taskDetailList){
@@ -123,7 +123,7 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
                 .gt(LocationType::getWidth, wcsTask.getWidth())
                 .gt(LocationType::getHeight, wcsTask.getHeight())
                 .gt(LocationType::getMaxWeight, wcsTask.getWidth())
-                .gt(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode());
+                .eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode());
         List<LocationType> locationTypeList = locationTypeService.list(lambdaQueryWrapper);
         List<String> codeList = new ArrayList<>();
         for (LocationType locationType: locationTypeList) {
@@ -109,7 +109,9 @@ public class ApiLogAspect
             setApiLogException(log, e);
             throw e;
         }finally{
-            finishApiLog(log, connection, ret.toString());
+            if(ret != null) {
+                finishApiLog(log, connection, ret.toString());
+            }
             return ret;
         }
     }
@@ -261,6 +261,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/getWarehouseByUserCode", "anon");
         filterChainDefinitionMap.put("/API/WMS/v2/login", "anon");
         filterChainDefinitionMap.put("/api/**", "anon");
+        filterChainDefinitionMap.put("/manager/**", "anon");
         // 系统权限列表
 //        filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());
  
@@ -37,6 +37,12 @@ public class Zone implements Serializable {
     private String companyCode;
  
     /**
+     * 库位类型
+     */
+    @TableField(value = "locationType")
+    private String locationType;
+
+    /**
      * 描述
      */
     @TableField(value = "name")
@@ -125,6 +125,9 @@ public class ReceiptTaskService {
             String locationCode = receiptContainerHeader.getToLocation();
             if(StringUtils.isNotEmpty(locationCode)) {
                 Location desLocation = locationService.findLocationByCode(locationCode);
+                if(desLocation.getWarehouseCode().equals(ShiroUtils.getWarehouseCode())) {
+                    return AjaxResult.error("库位对应仓库不对");
+                }
                 if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {
                     return AjaxResult.error("目标库位：" + desLocation + "旁边存在任务，请完成任务以后再分配");
                 }
@@ -275,7 +275,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
  
             // 给wcs传递任务
-            taskAssignService.wcsTaskAssign(task);
+
+             AjaxResult ajaxResult = taskAssignService.wcsTaskAssign(task);
+             if(ajaxResult != null && ajaxResult.hasErr()) {
+                 return AjaxResult.error(ajaxResult.getMsg());
+             }
  
  
             //修改任务头表
@@ -29,12 +29,12 @@
 					<input id="name" name="name" class="form-control" type="text">
 				</div>
 			</div>
-<!--			<div class="form-group">-->
-<!--				<label class="col-sm-3 control-label">库位类型：</label>-->
-<!--				<div class="col-sm-8">-->
-<!--					<input id="locationType" name="locationType" class="form-control" type="text">-->
-<!--				</div>-->
-<!--			</div>-->
+			<div class="form-group">
+				<label class="col-sm-3 control-label">库位类型：</label>
+				<div class="col-sm-8">
+					<input id="locationType" name="locationType" class="form-control" type="text">
+				</div>
+			</div>
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">创建时间：</label>-->
 				<!--<div class="col-sm-8">-->