diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java index 96611c4..d9daea4 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java @@ -525,4 +525,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai return success; } + @Override + public boolean updateById(ReceiptContainerHeader receiptContainerHeader) { + LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); + receiptContainerHeaderLambdaQueryWrapper.eq(ReceiptContainerHeader::getId, receiptContainerHeader.getId()).lt(receiptContainerHeader.getStatus() != null, + ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_FINISHED); + return super.update(receiptContainerHeader, receiptContainerHeaderLambdaQueryWrapper); + } } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java index 9c4f32d..db1caaa 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java @@ -313,4 +313,12 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, R return receiptHeader; } + @Override + public boolean updateById(ReceiptHeader receiptHeader) { + LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); + receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getId, receiptHeader.getId()) + .lt(receiptHeader.getFirstStatus() != null, ReceiptHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_RETURN) + .lt(receiptHeader.getLastStatus() != null, ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_RETURN); + return super.update(receiptHeader, receiptHeaderLambdaQueryWrapper); + } } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java index 7d2a632..ce008e1 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java @@ -308,4 +308,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont return shipmentContainerHeader; } + @Override + public boolean updateById(ShipmentContainerHeader shipmentContainerHeader) { + LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); + shipmentContainerHeaderLambdaQueryWrapper.eq(ShipmentContainerHeader::getId, shipmentContainerHeader.getId()).lt(shipmentContainerHeader.getStatus() != null, + ShipmentContainerHeader::getStatus, QuantityConstant.SHIPMENT_CONTAINER_FINISHED); + return super.update(shipmentContainerHeader, shipmentContainerHeaderLambdaQueryWrapper); + } } diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java index 4c7c614..fb754aa 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java @@ -538,4 +538,13 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, } return Result.OK("自动预配盘出库成功"); } + + @Override + public boolean updateById(ShipmentHeader shipmentHeader) { + LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); + shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getId, shipmentHeader.getId()) + .lt(shipmentHeader.getFirstStatus() != null, ShipmentHeader::getFirstStatus, QuantityConstant.SHIPMENT_HEADER_RETURN) + .lt(shipmentHeader.getLastStatus() != null, ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_RETURN); + return super.update(shipmentHeader, shipmentHeaderLambdaQueryWrapper); + } } 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 2f069cf..23591e3 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 @@ -321,9 +321,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea return Result.error("创建出库查看任务时,容器编码为空"); } - //创建出库查看任务时,库存不能被冻结 + // 创建出库查看任务时,库存不能被冻结 LambdaQueryWrapper<InventoryDetail> inventoryDetailWrapper = Wrappers.lambdaQuery(); - inventoryDetailWrapper.eq(InventoryDetail::getContainerCode,containerCode); + inventoryDetailWrapper.eq(InventoryDetail::getContainerCode, containerCode); List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailWrapper); if (StringUtils.isEmpty(inventoryDetailList)) { return Result.error("创建出库查看任务时,库存详情为空"); @@ -458,25 +458,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea 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); - } + 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); + } } success = taskDetailService.saveBatch(taskDetailList); if (!success) { @@ -3288,4 +3288,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea } return Result.ok("取消任务成功"); } + + @Override + public boolean updateById(TaskHeader taskHeader) { + LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); + taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeader.getId()).lt(taskHeader.getStatus() != null, TaskHeader::getStatus, + QuantityConstant.TASK_STATUS_COMPLETED); + return super.update(taskHeader, taskHeaderLambdaQueryWrapper); + } }