叠盘完成任务，清空库存数据

肖超群
1 parent 691a5226
Showing 4 changed files with 47 additions and 18 deletions
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -173,7 +173,7 @@
              <a-divider type="vertical"/>
           </a-popconfirm>
  
-          <a-popconfirm v-if="record.status < 100 && record.taskType != 600 " v-has="'taskHeader:switchTask'" title="确定切换任务吗?" @confirm="() => switchTask(record)">
+          <a-popconfirm v-if="record.status <= 10 && record.taskType != 600 " v-has="'taskHeader:switchTask'" title="确定切换任务吗?" @confirm="() => switchTask(record)">
             <a-button type="danger">切换任务</a-button>
           </a-popconfirm>
         </span>
@@ -53,4 +53,6 @@ public interface IInventoryHeaderService extends IService&lt;InventoryHeader&gt; {
     boolean updateInventory(String containerCode, String locationCode, String warehouseCode);
  
     Result qualityInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode);
+
+    Result clearInentory(String containerCode, String warehouseCode);
 }
@@ -541,4 +541,28 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         return Result.ok("生成质检任务成功");
     }
  
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result clearInentory(String containerCode, String warehouseCode) {
+        InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
+        if (inventoryHeader == null) {
+            return Result.error("清空库存失败，没有找到库存头");
+        }
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByInventoryHeaderId(inventoryHeader.getId());
+        if (inventoryDetailList.size() == 0) {
+            return Result.error("清空库存失败，没有找到库存详情");
+        }
+        List<Integer> inventoryDetailIds = inventoryDetailList.stream().map(InventoryDetail::getId).collect(Collectors.toList());
+        if (!inventoryDetailService.removeByIds(inventoryDetailIds)) {
+            throw new JeecgBootException("清空库存失败，删除库存详情失败");
+        }
+        if (!inventoryHeaderService.removeById(inventoryHeader.getId())) {
+            throw new JeecgBootException("清空库存失败，删除库存头失败");
+        }
+        if (!containerService.updateFillStatus(containerCode, QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode)) {
+            throw new JeecgBootException("清空库存失败，更新托盘状态失败");
+        }
+        return Result.ok("清空库存成功");
+    }
+
 }
@@ -1061,23 +1061,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             case QuantityConstant.TASK_TYPE_WHOLESHIPMENT:
             case QuantityConstant.TASK_TYPE_SORTINGSHIPMENT:
                 result = taskHeaderService.completeShipmentTask(taskHeader);
-                if (foldFlag) {
-                    String fromLocationCode = taskHeader.getFromLocationCode();
-                    String toLocationCode = taskHeader.getToLocationCode();
-                    String containerCode = taskHeader.getContainerCode();
-                    String warehouseCode = taskHeader.getWarehouseCode();
-                    if (!containerService.updateLocationCode(containerCode, QuantityConstant.EMPTY_STRING, warehouseCode)) {
-                        throw new JeecgBootException("完成任务," + containerCode + " 叠盘清空容器数据失败");
-                    }
-                    if (!locationService.updateContainerCode(fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode)) {
-                        throw new JeecgBootException("完成任务," + containerCode + " 叠盘清空起始库位失败");
-                    }
-                    if (StringUtils.isNotEmpty(toLocationCode)) {
-                        if (!locationService.updateContainerCode(toLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode)) {
-                            throw new JeecgBootException("完成任务," + containerCode + " 叠盘清空目标库位失败");
-                        }
-                    }
-                }
                 break;
             case QuantityConstant.TASK_TYPE_CYCLECOUNT:
                 result = taskHeaderService.completeCycleCountTask(taskHeader);
@@ -1109,6 +1092,26 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             default:
                 throw new JeecgBootException("完成任务," + "不支持的任务类型" + taskType);
         }
+        if (foldFlag) {
+            String fromLocationCode = taskHeader.getFromLocationCode();
+            String toLocationCode = taskHeader.getToLocationCode();
+            String containerCode = taskHeader.getContainerCode();
+            String warehouseCode = taskHeader.getWarehouseCode();
+            if (!containerService.updateLocationCode(containerCode, QuantityConstant.EMPTY_STRING, warehouseCode)) {
+                throw new JeecgBootException("完成任务," + containerCode + " 叠盘清空容器数据失败");
+            }
+            if (StringUtils.isNotEmpty(fromLocationCode)) {
+                if (!locationService.updateContainerCode(fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode)) {
+                    throw new JeecgBootException("完成任务," + containerCode + " 叠盘清空起始库位失败");
+                }
+            }
+            if (StringUtils.isNotEmpty(toLocationCode)) {
+                if (!locationService.updateContainerCode(toLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode)) {
+                    throw new JeecgBootException("完成任务," + containerCode + " 叠盘清空目标库位失败");
+                }
+            }
+            inventoryHeaderService.clearInentory(containerCode, warehouseCode);
+        }
         return result;
     }