Commit aebe0c7b58ea0cdeae5550ec8f0bd99ca60b3fd3
1 parent
1b3d98ac
增加更新状态的条件
Showing
5 changed files
with
60 additions
and
21 deletions
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 | @@ -525,4 +525,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai | ||
| 525 | return success; | 525 | return success; |
| 526 | } | 526 | } |
| 527 | 527 | ||
| 528 | + @Override | ||
| 529 | + public boolean updateById(ReceiptContainerHeader receiptContainerHeader) { | ||
| 530 | + LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 531 | + receiptContainerHeaderLambdaQueryWrapper.eq(ReceiptContainerHeader::getId, receiptContainerHeader.getId()).lt(receiptContainerHeader.getStatus() != null, | ||
| 532 | + ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_FINISHED); | ||
| 533 | + return super.update(receiptContainerHeader, receiptContainerHeaderLambdaQueryWrapper); | ||
| 534 | + } | ||
| 528 | } | 535 | } |
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 | @@ -313,4 +313,12 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, R | ||
| 313 | return receiptHeader; | 313 | return receiptHeader; |
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | + @Override | ||
| 317 | + public boolean updateById(ReceiptHeader receiptHeader) { | ||
| 318 | + LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 319 | + receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getId, receiptHeader.getId()) | ||
| 320 | + .lt(receiptHeader.getFirstStatus() != null, ReceiptHeader::getFirstStatus, QuantityConstant.RECEIPT_HEADER_RETURN) | ||
| 321 | + .lt(receiptHeader.getLastStatus() != null, ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_RETURN); | ||
| 322 | + return super.update(receiptHeader, receiptHeaderLambdaQueryWrapper); | ||
| 323 | + } | ||
| 316 | } | 324 | } |
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 | @@ -308,4 +308,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont | ||
| 308 | return shipmentContainerHeader; | 308 | return shipmentContainerHeader; |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | + @Override | ||
| 312 | + public boolean updateById(ShipmentContainerHeader shipmentContainerHeader) { | ||
| 313 | + LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 314 | + shipmentContainerHeaderLambdaQueryWrapper.eq(ShipmentContainerHeader::getId, shipmentContainerHeader.getId()).lt(shipmentContainerHeader.getStatus() != null, | ||
| 315 | + ShipmentContainerHeader::getStatus, QuantityConstant.SHIPMENT_CONTAINER_FINISHED); | ||
| 316 | + return super.update(shipmentContainerHeader, shipmentContainerHeaderLambdaQueryWrapper); | ||
| 317 | + } | ||
| 311 | } | 318 | } |
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, | @@ -538,4 +538,13 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, | ||
| 538 | } | 538 | } |
| 539 | return Result.OK("自动预配盘出库成功"); | 539 | return Result.OK("自动预配盘出库成功"); |
| 540 | } | 540 | } |
| 541 | + | ||
| 542 | + @Override | ||
| 543 | + public boolean updateById(ShipmentHeader shipmentHeader) { | ||
| 544 | + LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 545 | + shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getId, shipmentHeader.getId()) | ||
| 546 | + .lt(shipmentHeader.getFirstStatus() != null, ShipmentHeader::getFirstStatus, QuantityConstant.SHIPMENT_HEADER_RETURN) | ||
| 547 | + .lt(shipmentHeader.getLastStatus() != null, ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_RETURN); | ||
| 548 | + return super.update(shipmentHeader, shipmentHeaderLambdaQueryWrapper); | ||
| 549 | + } | ||
| 541 | } | 550 | } |
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 | @@ -321,9 +321,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 321 | return Result.error("创建出库查看任务时，容器编码为空"); | 321 | return Result.error("创建出库查看任务时，容器编码为空"); |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | - //创建出库查看任务时，库存不能被冻结 | 324 | + // 创建出库查看任务时，库存不能被冻结 |
| 325 | LambdaQueryWrapper<InventoryDetail> inventoryDetailWrapper = Wrappers.lambdaQuery(); | 325 | LambdaQueryWrapper<InventoryDetail> inventoryDetailWrapper = Wrappers.lambdaQuery(); |
| 326 | - inventoryDetailWrapper.eq(InventoryDetail::getContainerCode,containerCode); | 326 | + inventoryDetailWrapper.eq(InventoryDetail::getContainerCode, containerCode); |
| 327 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailWrapper); | 327 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailWrapper); |
| 328 | if (StringUtils.isEmpty(inventoryDetailList)) { | 328 | if (StringUtils.isEmpty(inventoryDetailList)) { |
| 329 | return Result.error("创建出库查看任务时，库存详情为空"); | 329 | return Result.error("创建出库查看任务时，库存详情为空"); |
| @@ -458,25 +458,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -458,25 +458,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 458 | return Result.error("没有正常状态的库存详情"); | 458 | return Result.error("没有正常状态的库存详情"); |
| 459 | } | 459 | } |
| 460 | for (InventoryDetail inventoryDetail : inventoryDetailList) { | 460 | for (InventoryDetail inventoryDetail : inventoryDetailList) { |
| 461 | - if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) { | ||
| 462 | - TaskDetail taskDetail = new TaskDetail(); | ||
| 463 | - taskDetail.setTaskHeaderId(taskHeader.getId()); | ||
| 464 | - taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); | ||
| 465 | - taskDetail.setWarehouseCode(warehouseCode); | ||
| 466 | - taskDetail.setCompanyCode(inventoryDetail.getCompanyCode()); | ||
| 467 | - taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); | ||
| 468 | - taskDetail.setMaterialName(inventoryDetail.getMaterialName()); | ||
| 469 | - taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec()); | ||
| 470 | - taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit()); | ||
| 471 | - taskDetail.setFromInventoryDetailId(inventoryDetail.getId()); | ||
| 472 | - taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus()); | ||
| 473 | - taskDetail.setQty(inventoryDetail.getQty()); | ||
| 474 | - taskDetail.setBatch(inventoryDetail.getBatch()); | ||
| 475 | - taskDetail.setLot(inventoryDetail.getLot()); | ||
| 476 | - taskDetail.setProject(inventoryDetail.getProject()); | ||
| 477 | - taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); | ||
| 478 | - taskDetailList.add(taskDetail); | ||
| 479 | - } | 461 | + if (inventoryDetail.getEnable() == QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE) { |
| 462 | + TaskDetail taskDetail = new TaskDetail(); | ||
| 463 | + taskDetail.setTaskHeaderId(taskHeader.getId()); | ||
| 464 | + taskDetail.setTaskType(QuantityConstant.TASK_TYPE_QUALITY); | ||
| 465 | + taskDetail.setWarehouseCode(warehouseCode); | ||
| 466 | + taskDetail.setCompanyCode(inventoryDetail.getCompanyCode()); | ||
| 467 | + taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); | ||
| 468 | + taskDetail.setMaterialName(inventoryDetail.getMaterialName()); | ||
| 469 | + taskDetail.setMaterialSpec(inventoryDetail.getMaterialSpec()); | ||
| 470 | + taskDetail.setMaterialUnit(inventoryDetail.getMaterialUnit()); | ||
| 471 | + taskDetail.setFromInventoryDetailId(inventoryDetail.getId()); | ||
| 472 | + taskDetail.setInventoryStatus(inventoryDetail.getInventoryStatus()); | ||
| 473 | + taskDetail.setQty(inventoryDetail.getQty()); | ||
| 474 | + taskDetail.setBatch(inventoryDetail.getBatch()); | ||
| 475 | + taskDetail.setLot(inventoryDetail.getLot()); | ||
| 476 | + taskDetail.setProject(inventoryDetail.getProject()); | ||
| 477 | + taskDetail.setReceiveTime(inventoryDetail.getReceiveTime()); | ||
| 478 | + taskDetailList.add(taskDetail); | ||
| 479 | + } | ||
| 480 | } | 480 | } |
| 481 | success = taskDetailService.saveBatch(taskDetailList); | 481 | success = taskDetailService.saveBatch(taskDetailList); |
| 482 | if (!success) { | 482 | if (!success) { |
| @@ -3288,4 +3288,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3288,4 +3288,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3288 | } | 3288 | } |
| 3289 | return Result.ok("取消任务成功"); | 3289 | return Result.ok("取消任务成功"); |
| 3290 | } | 3290 | } |
| 3291 | + | ||
| 3292 | + @Override | ||
| 3293 | + public boolean updateById(TaskHeader taskHeader) { | ||
| 3294 | + LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 3295 | + taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeader.getId()).lt(taskHeader.getStatus() != null, TaskHeader::getStatus, | ||
| 3296 | + QuantityConstant.TASK_STATUS_COMPLETED); | ||
| 3297 | + return super.update(taskHeader, taskHeaderLambdaQueryWrapper); | ||
| 3298 | + } | ||
| 3291 | } | 3299 | } |