diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java index 3f4b52b..66b5449 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java @@ -525,6 +525,14 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe List<String> containerCodeList = inventoryDetailList.stream().map(InventoryDetail::getContainerCode).collect(Collectors.toList()); for (String containerCode : containerCodeList) { + //存在冻结状态的库存详情就不能创建质检任务 + LambdaQueryWrapper<InventoryDetail> inventoryDetailWrapper = Wrappers.lambdaQuery(); + inventoryDetailWrapper.eq(InventoryDetail::getContainerCode,containerCode); + List<InventoryDetail> inventoryDetailList1 = inventoryDetailService.list(inventoryDetailWrapper); + List<Integer> enableList = inventoryDetailList1.stream().map(InventoryDetail::getEnable).distinct().collect(Collectors.toList()); + if (enableList.contains(QuantityConstant.INVENTORY_DETAIL_STATUS_CONTAINER)) { + return Result.error("质检库存详情失败,托盘" + containerCode + "存在冻结的库存详情"); + } Result result = taskHeaderService.createQualityTask(containerCode, toPortCode, warehouseCode); if (!result.isSuccess()) { throw new JeecgBootException(result.getMessage()); diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java index 628b5b6..9041b63 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java @@ -489,30 +489,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); List<TaskDetail> taskDetailList = new ArrayList<>(); if (inventoryDetailList.size() != 0) { - List<Integer> enableList = inventoryDetailList.stream().map(InventoryDetail::getEnable).distinct().collect(Collectors.toList()); - if (!enableList.contains(QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE)) { - return Result.error("没有正常状态的库存详情"); - } for (InventoryDetail inventoryDetail : inventoryDetailList) { - if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) { - TaskDetail taskDetail = new TaskDetail(); - taskDetail.setTaskHeaderId(taskHeader.getId()); - taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); - taskDetail.setWarehouseCode(warehouseCode); - taskDetail.setCompanyCode(inventoryDetail.getCompanyCode()); - taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); - taskDetail.setMaterialName(inventoryDetail.getMaterialName()); - taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec()); - taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit()); - taskDetail.setFromInventoryDetailId(inventoryDetail.getId()); - taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus()); - taskDetail.setQty(inventoryDetail.getQty()); - taskDetail.setBatch(inventoryDetail.getBatch()); - taskDetail.setLot(inventoryDetail.getLot()); - taskDetail.setProject(inventoryDetail.getProject()); - taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); - taskDetailList.add(taskDetail); - } + TaskDetail taskDetail = new TaskDetail(); + taskDetail.setTaskHeaderId(taskHeader.getId()); + taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); + taskDetail.setWarehouseCode(warehouseCode); + taskDetail.setCompanyCode(inventoryDetail.getCompanyCode()); + taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); + taskDetail.setMaterialName(inventoryDetail.getMaterialName()); + taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec()); + taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit()); + taskDetail.setFromInventoryDetailId(inventoryDetail.getId()); + taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus()); + taskDetail.setQty(inventoryDetail.getQty()); + taskDetail.setBatch(inventoryDetail.getBatch()); + taskDetail.setLot(inventoryDetail.getLot()); + taskDetail.setProject(inventoryDetail.getProject()); + taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); + taskDetailList.add(taskDetail); } success = taskDetailService.saveBatch(taskDetailList); if (!success) {