修复部分问题

游杰
1 parent 04d0b206
Showing 4 changed files with 9 additions and 15 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -124,9 +124,6 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
         if (StringUtils.isNull(wcsTask.getHeight())) {
             return AjaxResult.error("高为空");
         }
-//        if (StringUtils.isNull(wcsTask.getWeight())) {
-//            return AjaxResult.error("重为空");
-//        }
         return verticalWarehouseAllocation(wcsTask);
     }
  
@@ -246,14 +246,16 @@ public class ShipmentTaskService {
         List<TaskDetail> taskDetails = taskDetailService.findByTaskId(task.getId());
  
         List<Integer> shipmentHeadIds = new ArrayList<>();
-        if (task.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
+        if (task.getStatus().intValue() == QuantityConstant.TASK_STATUS_COMPLETED) {
             throw new ServiceException("任务已完成");
         }
+
         if (StringUtils.isEmpty(task.getFromLocation())) {
             throw new ServiceException("任务" + task.getId() + "没有起始库位，执行中止");
         }
  
-        if (StringUtils.isEmpty(task.getToLocation()) && task.getTaskType().equals(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)) {
+        if (StringUtils.isEmpty(task.getToLocation())
+                && task.getTaskType().equals(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)) {
             throw new ServiceException("任务" + task.getId() + "没有目的库位，执行中止");
         }
  
@@ -313,7 +315,7 @@ public class ShipmentTaskService {
                     inventoryDetailService.removeById(inventoryDetail.getId());
                     inventoryHeader.setTotalQty(inventoryHeader.getTotalQty().subtract(taskDetail.getQty()));
                     inventoryHeader.setTotalLines(inventoryHeader.getTotalLines() - 1);
-                    if (inventoryHeader.getTotalQty().signum() == 0){
+                    if (inventoryHeader.getTotalQty().signum() == 0) {
                         inventoryHeaderService.removeById(inventoryHeader.getId());
                     } else {
                         inventoryHeaderService.updateById(inventoryHeader);
@@ -102,6 +102,10 @@ public class TransferTaskService {
             return AjaxResult.error("目标库位和源库位高度不一样");
         }
  
+        if(!sourceLocation.getLocationType().equals(desLocation.getLocationType())) {
+            return AjaxResult.error("目标库位和源库位库位类型不一样");
+        }
+
         if(!sourceLocation.getArea().equals(desLocation.getArea())) {
             return AjaxResult.error("目标库位和源库位不在同一个区域");
         }
@@ -511,15 +511,6 @@ public class WorkTaskService {
             throw new ServiceException("更新容器状态失败");
         }
  
-        if (QuantityConstant.STATUS_CONTAINER_SOME.equals(container.getStatus())) {
-            LambdaUpdateWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaUpdate();
-            queryWrapper.eq(InventoryDetail::getLocationCode, taskHeader.getToLocation())
-                    .eq(InventoryDetail::getContainerCode, taskHeader.getContainerCode())
-                    .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
-            if (!inventoryDetailService.update(queryWrapper)) {
-                throw new ServiceException("更新失败");
-            }
-        }
         return AjaxResult.success();
     }