Commit a83c563c7691d732b03b940c74de6ff4dd22761b
1 parent
93cab6f5
优先出外侧托盘
Showing
3 changed files
with
124 additions
and
116 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
| @@ -870,11 +870,28 @@ public class WcsServiceImpl implements WcsService { | @@ -870,11 +870,28 @@ public class WcsServiceImpl implements WcsService { | ||
| 870 | } | 870 | } |
| 871 | } | 871 | } |
| 872 | } | 872 | } |
| 873 | + LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 874 | + taskHeaderLambdaQueryWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED) | ||
| 875 | + .eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT).eq(TaskHeader::getToPortCode, port).eq(TaskHeader::getZoneCode, zoneCode); | ||
| 876 | + TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); | ||
| 877 | + if (taskHeader != null) { | ||
| 878 | + return Result.ok("已经有空托盘组出库任务，不要重复发送！"); | ||
| 879 | + } | ||
| 873 | containerList.removeAll(removeContainerList); | 880 | containerList.removeAll(removeContainerList); |
| 874 | if (!(containerList != null && containerList.size() > 0)) { | 881 | if (!(containerList != null && containerList.size() > 0)) { |
| 875 | return Result.error("没有找到合适的空托盘组！"); | 882 | return Result.error("没有找到合适的空托盘组！"); |
| 876 | } | 883 | } |
| 877 | - String containerCode = containerList.get(0).getCode(); | 884 | + List<String> locationCodeList = containerList.stream().map(Container::getLocationCode).collect(Collectors.toList()); |
| 885 | + if (locationCodeList.size() == 0) { | ||
| 886 | + return Result.error("没有找到合适的空托盘组！"); | ||
| 887 | + } | ||
| 888 | + LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 889 | + locationLambdaQueryWrapper.in(Location::getCode, locationCodeList).orderByAsc(Location::getRowFlag); | ||
| 890 | + List<Location> locationList = locationService.list(locationLambdaQueryWrapper); | ||
| 891 | + if (locationList.size() == 0) { | ||
| 892 | + return Result.error("批量创建空托盘出库时, 没有找到合适的空托盘组！"); | ||
| 893 | + } | ||
| 894 | + String containerCode = locationList.get(0).getContainerCode(); | ||
| 878 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); | 895 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); |
| 879 | if (container == null) { | 896 | if (container == null) { |
| 880 | return Result.error("没有找到托盘, 托盘号:" + containerCode); | 897 | return Result.error("没有找到托盘, 托盘号:" + containerCode); |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
| @@ -475,13 +475,13 @@ public class TaskHeaderController extends HuahengBaseController { | @@ -475,13 +475,13 @@ public class TaskHeaderController extends HuahengBaseController { | ||
| 475 | @RequiresPermissions("taskHeader:emptyOut") | 475 | @RequiresPermissions("taskHeader:emptyOut") |
| 476 | @PostMapping("/createEmptyOut") | 476 | @PostMapping("/createEmptyOut") |
| 477 | public Result createEmptyOut(@RequestBody TaskHeader taskHeader, HttpServletRequest req) { | 477 | public Result createEmptyOut(@RequestBody TaskHeader taskHeader, HttpServletRequest req) { |
| 478 | - String contaienrCode = taskHeader.getContainerCode(); | 478 | + String containerCode = taskHeader.getContainerCode(); |
| 479 | String toPortCode = taskHeader.getToPortCode(); | 479 | String toPortCode = taskHeader.getToPortCode(); |
| 480 | String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); | 480 | String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); |
| 481 | Result result = handleMultiProcess("createEmptyOut", new MultiProcessListener() { | 481 | Result result = handleMultiProcess("createEmptyOut", new MultiProcessListener() { |
| 482 | @Override | 482 | @Override |
| 483 | public Result<?> doProcess() { | 483 | public Result<?> doProcess() { |
| 484 | - Result result = taskHeaderService.createEmptyOut(contaienrCode, toPortCode, warehouseCode); | 484 | + Result result = taskHeaderService.createEmptyOut(containerCode, toPortCode, warehouseCode); |
| 485 | return result; | 485 | return result; |
| 486 | } | 486 | } |
| 487 | }); | 487 | }); |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
| @@ -91,9 +91,9 @@ import lombok.extern.slf4j.Slf4j; | @@ -91,9 +91,9 @@ import lombok.extern.slf4j.Slf4j; | ||
| 91 | 91 | ||
| 92 | /** | 92 | /** |
| 93 | * @Description: 任务表 | 93 | * @Description: 任务表 |
| 94 | - * @Author: jeecg-boot | ||
| 95 | - * @Date: 2022-11-10 | ||
| 96 | - * @Version: V1.0 | 94 | + * @Author: jeecg-boot |
| 95 | + * @Date: 2022-11-10 | ||
| 96 | + * @Version: V1.0 | ||
| 97 | */ | 97 | */ |
| 98 | @Slf4j | 98 | @Slf4j |
| 99 | @Service | 99 | @Service |
| @@ -222,8 +222,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -222,8 +222,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 222 | 222 | ||
| 223 | /** | 223 | /** |
| 224 | * 如果库位是锁定的，那么这个库位一定是被某个任务占用。 | 224 | * 如果库位是锁定的，那么这个库位一定是被某个任务占用。 |
| 225 | - * | ||
| 226 | - * @param location | 225 | + * @param location |
| 227 | * @return | 226 | * @return |
| 228 | */ | 227 | */ |
| 229 | @Override | 228 | @Override |
| @@ -333,11 +332,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -333,11 +332,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 333 | } | 332 | } |
| 334 | 333 | ||
| 335 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_TRANSFER, containerCode, fromLocationCode, toLocationCode, | 334 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_TRANSFER, containerCode, fromLocationCode, toLocationCode, |
| 336 | - warehouseCode); | 335 | + warehouseCode); |
| 337 | if (!result.isSuccess()) { | 336 | if (!result.isSuccess()) { |
| 338 | throw new JeecgBootException(result.getMessage()); | 337 | throw new JeecgBootException(result.getMessage()); |
| 339 | } | 338 | } |
| 340 | - TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult(); | 339 | + TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult(); |
| 341 | String zoneCode = taskLockEntity.getZoneCode(); | 340 | String zoneCode = taskLockEntity.getZoneCode(); |
| 342 | // 4. 判断源库位旁边有托盘但是没有任务,那么不允许移库 | 341 | // 4. 判断源库位旁边有托盘但是没有任务,那么不允许移库 |
| 343 | TaskHeader taskHeader = new TaskHeader(); | 342 | TaskHeader taskHeader = new TaskHeader(); |
| @@ -404,11 +403,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -404,11 +403,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 404 | toLocationCode = fromLocationCode; | 403 | toLocationCode = fromLocationCode; |
| 405 | } | 404 | } |
| 406 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_CHECK_OUT, containerCode, fromLocationCode, toLocationCode, | 405 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_CHECK_OUT, containerCode, fromLocationCode, toLocationCode, |
| 407 | - warehouseCode); | 406 | + warehouseCode); |
| 408 | if (!result.isSuccess()) { | 407 | if (!result.isSuccess()) { |
| 409 | throw new JeecgBootException(result.getMessage()); | 408 | throw new JeecgBootException(result.getMessage()); |
| 410 | } | 409 | } |
| 411 | - TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult(); | 410 | + TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult(); |
| 412 | String zoneCode = taskLockEntity.getZoneCode(); | 411 | String zoneCode = taskLockEntity.getZoneCode(); |
| 413 | Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_PICK, zoneCode, warehouseCode); | 412 | Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_PICK, zoneCode, warehouseCode); |
| 414 | if (port == null) { | 413 | if (port == null) { |
| @@ -466,11 +465,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -466,11 +465,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 466 | toLocationCode = fromLocationCode; | 465 | toLocationCode = fromLocationCode; |
| 467 | } | 466 | } |
| 468 | Result result = | 467 | Result result = |
| 469 | - taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_QUALITY, containerCode, fromLocationCode, toLocationCode, warehouseCode); | 468 | + taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_QUALITY, containerCode, fromLocationCode, toLocationCode, warehouseCode); |
| 470 | if (!result.isSuccess()) { | 469 | if (!result.isSuccess()) { |
| 471 | throw new JeecgBootException(result.getMessage()); | 470 | throw new JeecgBootException(result.getMessage()); |
| 472 | } | 471 | } |
| 473 | - TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult(); | 472 | + TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult(); |
| 474 | String zoneCode = taskLockEntity.getZoneCode(); | 473 | String zoneCode = taskLockEntity.getZoneCode(); |
| 475 | Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_PICK, zoneCode, warehouseCode); | 474 | Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_PICK, zoneCode, warehouseCode); |
| 476 | if (port == null) { | 475 | if (port == null) { |
| @@ -494,7 +493,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -494,7 +493,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 494 | } | 493 | } |
| 495 | LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery(); | 494 | LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 496 | inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode).eq(InventoryDetail::getWarehouseCode, warehouseCode) | 495 | inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode).eq(InventoryDetail::getWarehouseCode, warehouseCode) |
| 497 | - .eq(InventoryDetail::getLocationCode, fromLocationCode); | 496 | + .eq(InventoryDetail::getLocationCode, fromLocationCode); |
| 498 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); | 497 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); |
| 499 | List<TaskDetail> taskDetailList = new ArrayList<>(); | 498 | List<TaskDetail> taskDetailList = new ArrayList<>(); |
| 500 | if (inventoryDetailList.size() != 0) { | 499 | if (inventoryDetailList.size() != 0) { |
| @@ -553,7 +552,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -553,7 +552,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 553 | return Result.error("创建跨站任务时，起始站台和目标站台不能相同"); | 552 | return Result.error("创建跨站任务时，起始站台和目标站台不能相同"); |
| 554 | } | 553 | } |
| 555 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_OVER_STATION, containerCode, QuantityConstant.EMPTY_STRING, | 554 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_OVER_STATION, containerCode, QuantityConstant.EMPTY_STRING, |
| 556 | - QuantityConstant.EMPTY_STRING, warehouseCode); | 555 | + QuantityConstant.EMPTY_STRING, warehouseCode); |
| 557 | if (!result.isSuccess()) { | 556 | if (!result.isSuccess()) { |
| 558 | throw new JeecgBootException(result.getMessage()); | 557 | throw new JeecgBootException(result.getMessage()); |
| 559 | } | 558 | } |
| @@ -629,7 +628,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -629,7 +628,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 629 | int high = locationHigh.getHigh(); | 628 | int high = locationHigh.getHigh(); |
| 630 | boolean bypass = false; | 629 | boolean bypass = false; |
| 631 | String toLocationCode = | 630 | String toLocationCode = |
| 632 | - allocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, null, null, bypass); | 631 | + allocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, null, null, bypass); |
| 633 | if (StringUtils.isEmpty(toLocationCode)) { | 632 | if (StringUtils.isEmpty(toLocationCode)) { |
| 634 | throw new JeecgBootException("创建空托盘组入库任务时，目标库位为空"); | 633 | throw new JeecgBootException("创建空托盘组入库任务时，目标库位为空"); |
| 635 | } | 634 | } |
| @@ -651,11 +650,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -651,11 +650,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 651 | } | 650 | } |
| 652 | log.info("开始创建空托盘组入库任务，容器编码" + containerCode + ",库位编码" + toLocationCode); | 651 | log.info("开始创建空托盘组入库任务，容器编码" + containerCode + ",库位编码" + toLocationCode); |
| 653 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT, containerCode, | 652 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT, containerCode, |
| 654 | - QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode); | 653 | + QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode); |
| 655 | if (!result.isSuccess()) { | 654 | if (!result.isSuccess()) { |
| 656 | throw new JeecgBootException(result.getMessage()); | 655 | throw new JeecgBootException(result.getMessage()); |
| 657 | } | 656 | } |
| 658 | - TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult(); | 657 | + TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult(); |
| 659 | String zoneCode = taskLockEntity.getZoneCode(); | 658 | String zoneCode = taskLockEntity.getZoneCode(); |
| 660 | TaskHeader taskHeader = new TaskHeader(); | 659 | TaskHeader taskHeader = new TaskHeader(); |
| 661 | taskHeader.setWarehouseCode(warehouseCode); | 660 | taskHeader.setWarehouseCode(warehouseCode); |
| @@ -688,11 +687,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -688,11 +687,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 688 | return Result.error("创建空托盘组出库任务时，仓库编码为空"); | 687 | return Result.error("创建空托盘组出库任务时，仓库编码为空"); |
| 689 | } | 688 | } |
| 690 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT, containerCode, | 689 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT, containerCode, |
| 691 | - QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode); | 690 | + QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode); |
| 692 | if (!result.isSuccess()) { | 691 | if (!result.isSuccess()) { |
| 693 | throw new JeecgBootException(result.getMessage()); | 692 | throw new JeecgBootException(result.getMessage()); |
| 694 | } | 693 | } |
| 695 | - TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult(); | 694 | + TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult(); |
| 696 | String zoneCode = taskLockEntity.getZoneCode(); | 695 | String zoneCode = taskLockEntity.getZoneCode(); |
| 697 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); | 696 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); |
| 698 | String fromLocationCode = container.getLocationCode(); | 697 | String fromLocationCode = container.getLocationCode(); |
| @@ -765,13 +764,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -765,13 +764,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 765 | } | 764 | } |
| 766 | // 5、删除容器上的库位编码，并设置状态为空闲，填充度状态为空盘 | 765 | // 5、删除容器上的库位编码，并设置状态为空闲，填充度状态为空盘 |
| 767 | boolean success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY, | 766 | boolean success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY, |
| 768 | - QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode); | 767 | + QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode); |
| 769 | if (!success) { | 768 | if (!success) { |
| 770 | throw new JeecgBootException("处理空出失败, 更新容器状态失败"); | 769 | throw new JeecgBootException("处理空出失败, 更新容器状态失败"); |
| 771 | } | 770 | } |
| 772 | // 6、删除库位上的容器编码，并设置状态为空闲 | 771 | // 6、删除库位上的容器编码，并设置状态为空闲 |
| 773 | success = | 772 | success = |
| 774 | - locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode); | 773 | + locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode); |
| 775 | if (!success) { | 774 | if (!success) { |
| 776 | throw new JeecgBootException("处理空出失败, 更新库位状态失败"); | 775 | throw new JeecgBootException("处理空出失败, 更新库位状态失败"); |
| 777 | } | 776 | } |
| @@ -786,8 +785,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -786,8 +785,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 786 | // 8、删除库存详情失败 | 785 | // 8、删除库存详情失败 |
| 787 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByContainerCode(containerCode, warehouseCode); | 786 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByContainerCode(containerCode, warehouseCode); |
| 788 | if (inventoryDetailList.size() != 0) { | 787 | if (inventoryDetailList.size() != 0) { |
| 789 | - List<Integer> idList = inventoryDetailList.stream().map(InventoryDetail::getId).collect(Collectors.toList()); | ||
| 790 | - ; | 788 | + List<Integer> idList = inventoryDetailList.stream().map(InventoryDetail::getId).collect(Collectors.toList());; |
| 791 | success = inventoryDetailService.removeByIds(idList); | 789 | success = inventoryDetailService.removeByIds(idList); |
| 792 | if (!success) { | 790 | if (!success) { |
| 793 | throw new JeecgBootException("处理空出失败, 删除库存详情失败"); | 791 | throw new JeecgBootException("处理空出失败, 删除库存详情失败"); |
| @@ -845,8 +843,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -845,8 +843,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 845 | } | 843 | } |
| 846 | } | 844 | } |
| 847 | } | 845 | } |
| 848 | - ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getReceiptContainerHeaderId()); | ||
| 849 | - ; | 846 | + ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getReceiptContainerHeaderId());; |
| 850 | if (receiptContainerHeader != null) { | 847 | if (receiptContainerHeader != null) { |
| 851 | success = receiptContainerHeaderService.updateStatusById(QuantityConstant.RECEIPT_CONTAINER_FINISHED, receiptContainerHeader.getId()); | 848 | success = receiptContainerHeaderService.updateStatusById(QuantityConstant.RECEIPT_CONTAINER_FINISHED, receiptContainerHeader.getId()); |
| 852 | if (!success) { | 849 | if (!success) { |
| @@ -992,7 +989,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -992,7 +989,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 992 | public TaskHeader getUnCompleteTaskByFromLocationCode(String fromLocationCode, String warehouseCode) { | 989 | public TaskHeader getUnCompleteTaskByFromLocationCode(String fromLocationCode, String warehouseCode) { |
| 993 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | 990 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 994 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocationCode, fromLocationCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, | 991 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocationCode, fromLocationCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, |
| 995 | - QuantityConstant.TASK_STATUS_COMPLETED); | 992 | + QuantityConstant.TASK_STATUS_COMPLETED); |
| 996 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); | 993 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); |
| 997 | return taskHeader; | 994 | return taskHeader; |
| 998 | } | 995 | } |
| @@ -1001,7 +998,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1001,7 +998,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1001 | public TaskHeader getUnCompleteTaskByToLocationCode(String toLocationCode, String warehouseCode) { | 998 | public TaskHeader getUnCompleteTaskByToLocationCode(String toLocationCode, String warehouseCode) { |
| 1002 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | 999 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 1003 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getToLocationCode, toLocationCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, | 1000 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getToLocationCode, toLocationCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, |
| 1004 | - QuantityConstant.TASK_STATUS_COMPLETED); | 1001 | + QuantityConstant.TASK_STATUS_COMPLETED); |
| 1005 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); | 1002 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); |
| 1006 | return taskHeader; | 1003 | return taskHeader; |
| 1007 | } | 1004 | } |
| @@ -1019,7 +1016,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1019,7 +1016,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1019 | public TaskHeader getUnCompleteTaskByContainerCode(String containerCode, String warehouseCode) { | 1016 | public TaskHeader getUnCompleteTaskByContainerCode(String containerCode, String warehouseCode) { |
| 1020 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | 1017 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 1021 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getContainerCode, containerCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, | 1018 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getContainerCode, containerCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, |
| 1022 | - QuantityConstant.TASK_STATUS_COMPLETED); | 1019 | + QuantityConstant.TASK_STATUS_COMPLETED); |
| 1023 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); | 1020 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); |
| 1024 | return taskHeader; | 1021 | return taskHeader; |
| 1025 | } | 1022 | } |
| @@ -1028,7 +1025,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1028,7 +1025,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1028 | public TaskHeader getUnCompleteTaskByPreTaskNo(int preTaskNo, String warehouseCode) { | 1025 | public TaskHeader getUnCompleteTaskByPreTaskNo(int preTaskNo, String warehouseCode) { |
| 1029 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | 1026 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 1030 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getPreTaskNo, preTaskNo).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, | 1027 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getPreTaskNo, preTaskNo).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus, |
| 1031 | - QuantityConstant.TASK_STATUS_COMPLETED); | 1028 | + QuantityConstant.TASK_STATUS_COMPLETED); |
| 1032 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); | 1029 | TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper); |
| 1033 | return taskHeader; | 1030 | return taskHeader; |
| 1034 | } | 1031 | } |
| @@ -1226,10 +1223,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1226,10 +1223,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1226 | * 创建空托盘入库 | 1223 | * 创建空托盘入库 |
| 1227 | * 1. 判断托盘号、库位编码是否满足要求 | 1224 | * 1. 判断托盘号、库位编码是否满足要求 |
| 1228 | * 2. 创建任务，锁定容器、库位 | 1225 | * 2. 创建任务，锁定容器、库位 |
| 1229 | - * | ||
| 1230 | - * @param containerCode | ||
| 1231 | - * @param toLocationCode | ||
| 1232 | - * @param warehouseCode | 1226 | + * @param containerCode |
| 1227 | + * @param toLocationCode | ||
| 1228 | + * @param warehouseCode | ||
| 1233 | * @return | 1229 | * @return |
| 1234 | */ | 1230 | */ |
| 1235 | @Override | 1231 | @Override |
| @@ -1255,7 +1251,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1255,7 +1251,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1255 | } | 1251 | } |
| 1256 | 1252 | ||
| 1257 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYRECEIPT, containerCode, QuantityConstant.EMPTY_STRING, | 1253 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYRECEIPT, containerCode, QuantityConstant.EMPTY_STRING, |
| 1258 | - toLocationCode, warehouseCode); | 1254 | + toLocationCode, warehouseCode); |
| 1259 | if (!result.isSuccess()) { | 1255 | if (!result.isSuccess()) { |
| 1260 | throw new JeecgBootException(result.getMessage()); | 1256 | throw new JeecgBootException(result.getMessage()); |
| 1261 | } | 1257 | } |
| @@ -1286,10 +1282,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1286,10 +1282,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1286 | 1282 | ||
| 1287 | /** | 1283 | /** |
| 1288 | * 创建空托盘出库 | 1284 | * 创建空托盘出库 |
| 1289 | - * | ||
| 1290 | - * @param containerCode | ||
| 1291 | - * @param toPortCode | ||
| 1292 | - * @param warehouseCode | 1285 | + * @param containerCode |
| 1286 | + * @param toPortCode | ||
| 1287 | + * @param warehouseCode | ||
| 1293 | * @return | 1288 | * @return |
| 1294 | */ | 1289 | */ |
| 1295 | @Override | 1290 | @Override |
| @@ -1308,11 +1303,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1308,11 +1303,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1308 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); | 1303 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); |
| 1309 | String fromLocationCode = container.getLocationCode(); | 1304 | String fromLocationCode = container.getLocationCode(); |
| 1310 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYSHIPMENT, containerCode, QuantityConstant.EMPTY_STRING, | 1305 | Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYSHIPMENT, containerCode, QuantityConstant.EMPTY_STRING, |
| 1311 | - QuantityConstant.EMPTY_STRING, warehouseCode); | 1306 | + QuantityConstant.EMPTY_STRING, warehouseCode); |
| 1312 | if (!result.isSuccess()) { | 1307 | if (!result.isSuccess()) { |
| 1313 | throw new JeecgBootException(result.getMessage()); | 1308 | throw new JeecgBootException(result.getMessage()); |
| 1314 | } | 1309 | } |
| 1315 | - TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult(); | 1310 | + TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult(); |
| 1316 | String zoneCode = taskLockEntity.getZoneCode(); | 1311 | String zoneCode = taskLockEntity.getZoneCode(); |
| 1317 | Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_OUT, zoneCode, warehouseCode); | 1312 | Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_OUT, zoneCode, warehouseCode); |
| 1318 | if (port == null) { | 1313 | if (port == null) { |
| @@ -1352,8 +1347,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1352,8 +1347,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1352 | } | 1347 | } |
| 1353 | LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery(); | 1348 | LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 1354 | containerLambdaQueryWrapper.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY).ne(Container::getLocationCode, QuantityConstant.EMPTY_STRING) | 1349 | containerLambdaQueryWrapper.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY).ne(Container::getLocationCode, QuantityConstant.EMPTY_STRING) |
| 1355 | - .eq(Container::getFillStatus, QuantityConstant.STATUS_CONTAINER_FILL_EMPTY).eq(Container::getWarehouseCode, warehouseCode) | ||
| 1356 | - .orderByAsc(Container::getUpdateTime); | 1350 | + .eq(Container::getFillStatus, QuantityConstant.STATUS_CONTAINER_FILL_EMPTY).eq(Container::getWarehouseCode, warehouseCode) |
| 1351 | + .orderByAsc(Container::getUpdateTime); | ||
| 1357 | List<Container> containerList = containerService.list(containerLambdaQueryWrapper); | 1352 | List<Container> containerList = containerService.list(containerLambdaQueryWrapper); |
| 1358 | List<Container> removeContainerList = new ArrayList<>(); | 1353 | List<Container> removeContainerList = new ArrayList<>(); |
| 1359 | if (CollectionUtils.isNotEmpty(containerList)) { | 1354 | if (CollectionUtils.isNotEmpty(containerList)) { |
| @@ -1372,7 +1367,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1372,7 +1367,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1372 | if (containerList.size() < num) { | 1367 | if (containerList.size() < num) { |
| 1373 | return Result.error("批量创建空托盘出库时, 没有足够数量的空托盘用于出库，空托盘数为" + containerList.size()); | 1368 | return Result.error("批量创建空托盘出库时, 没有足够数量的空托盘用于出库，空托盘数为" + containerList.size()); |
| 1374 | } | 1369 | } |
| 1375 | - List<String> containerCodeList = containerList.stream().map(Container::getCode).collect(Collectors.toList()); | 1370 | + List<String> locationCodeList = containerList.stream().map(Container::getLocationCode).collect(Collectors.toList()); |
| 1371 | + if (locationCodeList.size() == 0) { | ||
| 1372 | + return Result.error("没有找到合适的空托盘组！"); | ||
| 1373 | + } | ||
| 1374 | + LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 1375 | + locationLambdaQueryWrapper.in(Location::getCode, locationCodeList).orderByAsc(Location::getRowFlag); | ||
| 1376 | + List<Location> locationList = locationService.list(locationLambdaQueryWrapper); | ||
| 1377 | + if (locationList.size() == 0) { | ||
| 1378 | + return Result.error("批量创建空托盘出库时, 没有找到合适的空托盘组！"); | ||
| 1379 | + } | ||
| 1380 | + List<String> containerCodeList = locationList.stream().map(Location::getContainerCode).collect(Collectors.toList()); | ||
| 1376 | for (int i = 0; i < num; i++) { | 1381 | for (int i = 0; i < num; i++) { |
| 1377 | String containerCode = containerCodeList.get(i); | 1382 | String containerCode = containerCodeList.get(i); |
| 1378 | Result result = taskHeaderService.createEmptyOut(containerCode, toPortCode, warehouseCode); | 1383 | Result result = taskHeaderService.createEmptyOut(containerCode, toPortCode, warehouseCode); |
| @@ -1385,17 +1390,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1385,17 +1390,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1385 | 1390 | ||
| 1386 | /** | 1391 | /** |
| 1387 | * 完成入库任务 | 1392 | * 完成入库任务 |
| 1388 | - * | ||
| 1389 | - * @param taskHeader 任务 | ||
| 1390 | - * @return AjaxResult 完成入库任务结果 | 1393 | + * @param taskHeader 任务 |
| 1394 | + * @return AjaxResult 完成入库任务结果 | ||
| 1391 | */ | 1395 | */ |
| 1392 | @Override | 1396 | @Override |
| 1393 | @Transactional(rollbackFor = Exception.class) | 1397 | @Transactional(rollbackFor = Exception.class) |
| 1394 | @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1", | 1398 | @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1", |
| 1395 | - msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", | ||
| 1396 | - recordReturnValue = true) | 1399 | + msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", |
| 1400 | + recordReturnValue = true) | ||
| 1397 | @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1", | 1401 | @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1", |
| 1398 | - msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", recordReturnValue = true) | 1402 | + msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", recordReturnValue = true) |
| 1399 | @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情入库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true) | 1403 | @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情入库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true) |
| 1400 | public Result completeReceiptTask(TaskHeader taskHeader) { | 1404 | public Result completeReceiptTask(TaskHeader taskHeader) { |
| 1401 | if (taskHeader == null) { | 1405 | if (taskHeader == null) { |
| @@ -1417,7 +1421,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1417,7 +1421,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1417 | int allow = parameterConfigurationService.getIntValueByCode(QuantityConstant.RULE_CALL_BOX_ALLOW_EMPTY); | 1421 | int allow = parameterConfigurationService.getIntValueByCode(QuantityConstant.RULE_CALL_BOX_ALLOW_EMPTY); |
| 1418 | if (allow == QuantityConstant.RULE_ALLOW_EMPTY) { | 1422 | if (allow == QuantityConstant.RULE_ALLOW_EMPTY) { |
| 1419 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, | 1423 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, |
| 1420 | - fromLocationCode, toLocationCode, warehouseCode); | 1424 | + fromLocationCode, toLocationCode, warehouseCode); |
| 1421 | if (!result.isSuccess()) { | 1425 | if (!result.isSuccess()) { |
| 1422 | throw new JeecgBootException(result.getMessage()); | 1426 | throw new JeecgBootException(result.getMessage()); |
| 1423 | } | 1427 | } |
| @@ -1571,7 +1575,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1571,7 +1575,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1571 | } | 1575 | } |
| 1572 | } | 1576 | } |
| 1573 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode, | 1577 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode, |
| 1574 | - toLocationCode, warehouseCode); | 1578 | + toLocationCode, warehouseCode); |
| 1575 | if (!result.isSuccess()) { | 1579 | if (!result.isSuccess()) { |
| 1576 | throw new JeecgBootException(result.getMessage()); | 1580 | throw new JeecgBootException(result.getMessage()); |
| 1577 | } | 1581 | } |
| @@ -1589,18 +1593,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1589,18 +1593,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1589 | 1593 | ||
| 1590 | /** | 1594 | /** |
| 1591 | * 完成出库任务 | 1595 | * 完成出库任务 |
| 1592 | - * | ||
| 1593 | - * @param taskHeader 任务 | ||
| 1594 | - * @return result 完成出库任务 | 1596 | + * @param taskHeader 任务 |
| 1597 | + * @return result 完成出库任务 | ||
| 1595 | */ | 1598 | */ |
| 1596 | @Override | 1599 | @Override |
| 1597 | @Transactional(rollbackFor = Exception.class) | 1600 | @Transactional(rollbackFor = Exception.class) |
| 1598 | @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1", | 1601 | @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1", |
| 1599 | - msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", | ||
| 1600 | - recordReturnValue = true) | 1602 | + msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", |
| 1603 | + recordReturnValue = true) | ||
| 1601 | @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1", | 1604 | @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1", |
| 1602 | - msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()", | ||
| 1603 | - recordReturnValue = true) | 1605 | + msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()", |
| 1606 | + recordReturnValue = true) | ||
| 1604 | @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情出库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true) | 1607 | @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情出库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true) |
| 1605 | public Result completeShipmentTask(TaskHeader taskHeader) { | 1608 | public Result completeShipmentTask(TaskHeader taskHeader) { |
| 1606 | if (taskHeader == null) { | 1609 | if (taskHeader == null) { |
| @@ -1640,7 +1643,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1640,7 +1643,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1640 | } | 1643 | } |
| 1641 | } | 1644 | } |
| 1642 | List<ShipmentContainerAdvice> shipmentContainerAdviceList = | 1645 | List<ShipmentContainerAdvice> shipmentContainerAdviceList = |
| 1643 | - shipmentContainerAdviceService.getShipmentContainerAdviceListByShipmentContainerId(shipmentContainerHeader.getId()); | 1646 | + shipmentContainerAdviceService.getShipmentContainerAdviceListByShipmentContainerId(shipmentContainerHeader.getId()); |
| 1644 | for (ShipmentContainerAdvice shipmentContainerAdvice : shipmentContainerAdviceList) { | 1647 | for (ShipmentContainerAdvice shipmentContainerAdvice : shipmentContainerAdviceList) { |
| 1645 | if (!shipmentContainerAdviceService.updateStatusById(QuantityConstant.SHIPMENT_CONTAINER_FINISHED, shipmentContainerAdvice.getId())) { | 1648 | if (!shipmentContainerAdviceService.updateStatusById(QuantityConstant.SHIPMENT_CONTAINER_FINISHED, shipmentContainerAdvice.getId())) { |
| 1646 | throw new JeecgBootException("完成出库任务，更新出库预配盘失败"); | 1649 | throw new JeecgBootException("完成出库任务，更新出库预配盘失败"); |
| @@ -1664,7 +1667,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1664,7 +1667,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1664 | } | 1667 | } |
| 1665 | } | 1668 | } |
| 1666 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, | 1669 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, |
| 1667 | - fromLocationCode, toLocationCode, warehouseCode); | 1670 | + fromLocationCode, toLocationCode, warehouseCode); |
| 1668 | if (!result.isSuccess()) { | 1671 | if (!result.isSuccess()) { |
| 1669 | throw new JeecgBootException(result.getMessage()); | 1672 | throw new JeecgBootException(result.getMessage()); |
| 1670 | } | 1673 | } |
| @@ -1835,7 +1838,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1835,7 +1838,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1835 | } | 1838 | } |
| 1836 | } | 1839 | } |
| 1837 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode, | 1840 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode, |
| 1838 | - toLocationCode, warehouseCode); | 1841 | + toLocationCode, warehouseCode); |
| 1839 | if (!result.isSuccess()) { | 1842 | if (!result.isSuccess()) { |
| 1840 | throw new JeecgBootException(result.getMessage()); | 1843 | throw new JeecgBootException(result.getMessage()); |
| 1841 | } | 1844 | } |
| @@ -1911,8 +1914,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1911,8 +1914,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1911 | InventoryDetail inventoryDetail1 = inventoryDetailList.get(i); | 1914 | InventoryDetail inventoryDetail1 = inventoryDetailList.get(i); |
| 1912 | InventoryDetail inventoryDetail2 = inventoryDetailList.get(j); | 1915 | InventoryDetail inventoryDetail2 = inventoryDetailList.get(j); |
| 1913 | if (inventoryDetail1.getMaterialCode().equals(inventoryDetail2.getMaterialCode()) && inventoryDetail1.getBatch().equals(inventoryDetail2.getBatch()) | 1916 | if (inventoryDetail1.getMaterialCode().equals(inventoryDetail2.getMaterialCode()) && inventoryDetail1.getBatch().equals(inventoryDetail2.getBatch()) |
| 1914 | - && inventoryDetail1.getLot().equals(inventoryDetail2.getLot()) && inventoryDetail1.getProject().equals(inventoryDetail2.getProject()) | ||
| 1915 | - && inventoryDetail1.getInventoryStatus().equals(inventoryDetail2.getInventoryStatus())) { | 1917 | + && inventoryDetail1.getLot().equals(inventoryDetail2.getLot()) && inventoryDetail1.getProject().equals(inventoryDetail2.getProject()) |
| 1918 | + && inventoryDetail1.getInventoryStatus().equals(inventoryDetail2.getInventoryStatus())) { | ||
| 1916 | // 属性一样的库存，相加合并。 | 1919 | // 属性一样的库存，相加合并。 |
| 1917 | if (StringUtils.isNotEmpty(inventoryDetail1.getSn())) { | 1920 | if (StringUtils.isNotEmpty(inventoryDetail1.getSn())) { |
| 1918 | if (!inventoryDetail1.getSn().equals(inventoryDetail2.getSn())) { | 1921 | if (!inventoryDetail1.getSn().equals(inventoryDetail2.getSn())) { |
| @@ -1957,7 +1960,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -1957,7 +1960,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 1957 | 1960 | ||
| 1958 | /** | 1961 | /** |
| 1959 | * 锁定容器和库位分4种情况，入库任务、出库任务、分拣任务、换站任务 | 1962 | * 锁定容器和库位分4种情况，入库任务、出库任务、分拣任务、换站任务 |
| 1960 | - * | ||
| 1961 | * @param | 1963 | * @param |
| 1962 | */ | 1964 | */ |
| 1963 | @Override | 1965 | @Override |
| @@ -2174,7 +2176,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2174,7 +2176,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2174 | @Override | 2176 | @Override |
| 2175 | @Transactional(rollbackFor = Exception.class) | 2177 | @Transactional(rollbackFor = Exception.class) |
| 2176 | public Result completeTaskUnLockContainerAndLocation(String containerFillStatus, int taskType, String containerCode, String fromLocationCode, | 2178 | public Result completeTaskUnLockContainerAndLocation(String containerFillStatus, int taskType, String containerCode, String fromLocationCode, |
| 2177 | - String toLocationCode, String warehouseCode) { | 2179 | + String toLocationCode, String warehouseCode) { |
| 2178 | boolean success = false; | 2180 | boolean success = false; |
| 2179 | if (StringUtils.isEmpty(containerCode)) { | 2181 | if (StringUtils.isEmpty(containerCode)) { |
| 2180 | return Result.error("任务类型" + taskType + "完成任务时, 容器编码为空"); | 2182 | return Result.error("任务类型" + taskType + "完成任务时, 容器编码为空"); |
| @@ -2220,7 +2222,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2220,7 +2222,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2220 | break; | 2222 | break; |
| 2221 | case QuantityConstant.TASK_TYPE_OVER_STATION: | 2223 | case QuantityConstant.TASK_TYPE_OVER_STATION: |
| 2222 | success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY, | 2224 | success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY, |
| 2223 | - warehouseCode); | 2225 | + warehouseCode); |
| 2224 | break; | 2226 | break; |
| 2225 | } | 2227 | } |
| 2226 | if (!success) { | 2228 | if (!success) { |
| @@ -2232,7 +2234,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2232,7 +2234,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2232 | return Result.error("任务类型" + taskType + "完成任务时，" + toLocationCode + "目标库位不存在"); | 2234 | return Result.error("任务类型" + taskType + "完成任务时，" + toLocationCode + "目标库位不存在"); |
| 2233 | } | 2235 | } |
| 2234 | success = | 2236 | success = |
| 2235 | - locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode); | 2237 | + locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode); |
| 2236 | if (!success) { | 2238 | if (!success) { |
| 2237 | throw new JeecgBootException("任务类型" + taskType + "完成任务时,更新源库位失败"); | 2239 | throw new JeecgBootException("任务类型" + taskType + "完成任务时,更新源库位失败"); |
| 2238 | } | 2240 | } |
| @@ -2386,7 +2388,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2386,7 +2388,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2386 | if (!result.isSuccess()) { | 2388 | if (!result.isSuccess()) { |
| 2387 | throw new JeecgBootException(result.getMessage()); | 2389 | throw new JeecgBootException(result.getMessage()); |
| 2388 | } | 2390 | } |
| 2389 | - TaskHeader taskHeader = (TaskHeader) result.getResult(); | 2391 | + TaskHeader taskHeader = (TaskHeader)result.getResult(); |
| 2390 | if (taskHeader.getTaskType() == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) { | 2392 | if (taskHeader.getTaskType() == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) { |
| 2391 | if (port == null) { | 2393 | if (port == null) { |
| 2392 | throw new JeecgBootException("快速入库, 生成补充任务时必须有入库口"); | 2394 | throw new JeecgBootException("快速入库, 生成补充任务时必须有入库口"); |
| @@ -2456,7 +2458,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2456,7 +2458,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2456 | shipmentDetailList.add(shipmentDetail); | 2458 | shipmentDetailList.add(shipmentDetail); |
| 2457 | shipmentQtyList.add(qty); | 2459 | shipmentQtyList.add(qty); |
| 2458 | List<InventoryDetail> inventoryDetailList = | 2460 | List<InventoryDetail> inventoryDetailList = |
| 2459 | - inventoryDetailService.getInventoryDetailListByMaterialCodeToShipment(materialCode, zoneCode, qty, warehouseCode); | 2461 | + inventoryDetailService.getInventoryDetailListByMaterialCodeToShipment(materialCode, zoneCode, qty, warehouseCode); |
| 2460 | List<InventoryDetail> removeInventoryDetailList = new ArrayList<>(); | 2462 | List<InventoryDetail> removeInventoryDetailList = new ArrayList<>(); |
| 2461 | for (InventoryDetail inventoryDetail : inventoryDetailList) { | 2463 | for (InventoryDetail inventoryDetail : inventoryDetailList) { |
| 2462 | if (roadWay.intValue() == inventoryDetail.getRoadWay().intValue()) { | 2464 | if (roadWay.intValue() == inventoryDetail.getRoadWay().intValue()) { |
| @@ -2492,7 +2494,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2492,7 +2494,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2492 | ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId); | 2494 | ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId); |
| 2493 | BigDecimal shipQty = shipmentQtyList.get(i); | 2495 | BigDecimal shipQty = shipmentQtyList.get(i); |
| 2494 | InventoryDetail inventoryDetail = | 2496 | InventoryDetail inventoryDetail = |
| 2495 | - inventoryDetailService.getInventoryDetailByMaterialCodeToShipment(switchContainerCode, shipmentDetail.getMaterialCode(), shipQty, warehouseCode); | 2497 | + inventoryDetailService.getInventoryDetailByMaterialCodeToShipment(switchContainerCode, shipmentDetail.getMaterialCode(), shipQty, warehouseCode); |
| 2496 | CombinationModel combinationModel = new CombinationModel(); | 2498 | CombinationModel combinationModel = new CombinationModel(); |
| 2497 | combinationModel.setShipmentDetail(shipmentDetail); | 2499 | combinationModel.setShipmentDetail(shipmentDetail); |
| 2498 | combinationModel.setInventoryDetail(inventoryDetail); | 2500 | combinationModel.setInventoryDetail(inventoryDetail); |
| @@ -2585,9 +2587,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2585,9 +2587,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2585 | 2587 | ||
| 2586 | /** | 2588 | /** |
| 2587 | * 完成空托盘入库任务 | 2589 | * 完成空托盘入库任务 |
| 2588 | - * | ||
| 2589 | - * @param taskHeader 任务 | ||
| 2590 | - * @return Result 完成入库任务结果 | 2590 | + * @param taskHeader 任务 |
| 2591 | + * @return Result 完成入库任务结果 | ||
| 2591 | */ | 2592 | */ |
| 2592 | @Override | 2593 | @Override |
| 2593 | @Transactional(rollbackFor = Exception.class) | 2594 | @Transactional(rollbackFor = Exception.class) |
| @@ -2606,7 +2607,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2606,7 +2607,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2606 | return Result.error("完成空托盘入库任务时, 目标库位编码为空"); | 2607 | return Result.error("完成空托盘入库任务时, 目标库位编码为空"); |
| 2607 | } | 2608 | } |
| 2608 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYRECEIPT, | 2609 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYRECEIPT, |
| 2609 | - containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode); | 2610 | + containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode); |
| 2610 | if (!result.isSuccess()) { | 2611 | if (!result.isSuccess()) { |
| 2611 | throw new JeecgBootException(result.getMessage()); | 2612 | throw new JeecgBootException(result.getMessage()); |
| 2612 | } | 2613 | } |
| @@ -2621,8 +2622,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2621,8 +2622,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2621 | /** | 2622 | /** |
| 2622 | * 盘点完成 | 2623 | * 盘点完成 |
| 2623 | * 盘点有差异完成时状态为105 | 2624 | * 盘点有差异完成时状态为105 |
| 2624 | - * | ||
| 2625 | - * @param taskHeader | 2625 | + * @param taskHeader |
| 2626 | * @return | 2626 | * @return |
| 2627 | */ | 2627 | */ |
| 2628 | @Override | 2628 | @Override |
| @@ -2911,7 +2911,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2911,7 +2911,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2911 | cycleCountHeaderService.updataHeaderStatus(cycleCountDetail.getCycleCountHeadCode()); | 2911 | cycleCountHeaderService.updataHeaderStatus(cycleCountDetail.getCycleCountHeadCode()); |
| 2912 | 2912 | ||
| 2913 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_CHECK_OUT, | 2913 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_CHECK_OUT, |
| 2914 | - containerCode, fromLocationCode, toLocationCode, warehouseCode); | 2914 | + containerCode, fromLocationCode, toLocationCode, warehouseCode); |
| 2915 | if (!result.isSuccess()) { | 2915 | if (!result.isSuccess()) { |
| 2916 | throw new JeecgBootException(result.getMessage()); | 2916 | throw new JeecgBootException(result.getMessage()); |
| 2917 | } | 2917 | } |
| @@ -2925,9 +2925,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2925,9 +2925,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2925 | 2925 | ||
| 2926 | /** | 2926 | /** |
| 2927 | * 完成空托盘出库任务 | 2927 | * 完成空托盘出库任务 |
| 2928 | - * | ||
| 2929 | - * @param taskHeader 任务 | ||
| 2930 | - * @return Result 完成出库任务结果 | 2928 | + * @param taskHeader 任务 |
| 2929 | + * @return Result 完成出库任务结果 | ||
| 2931 | */ | 2930 | */ |
| 2932 | @Override | 2931 | @Override |
| 2933 | @Transactional(rollbackFor = Exception.class) | 2932 | @Transactional(rollbackFor = Exception.class) |
| @@ -2963,7 +2962,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2963,7 +2962,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2963 | return Result.error("完成空托盘出库任务时，" + toPortCode + "目标出库口不存在"); | 2962 | return Result.error("完成空托盘出库任务时，" + toPortCode + "目标出库口不存在"); |
| 2964 | } | 2963 | } |
| 2965 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYSHIPMENT, | 2964 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYSHIPMENT, |
| 2966 | - containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode); | 2965 | + containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode); |
| 2967 | if (!result.isSuccess()) { | 2966 | if (!result.isSuccess()) { |
| 2968 | throw new JeecgBootException(result.getMessage()); | 2967 | throw new JeecgBootException(result.getMessage()); |
| 2969 | } | 2968 | } |
| @@ -2977,9 +2976,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -2977,9 +2976,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 2977 | 2976 | ||
| 2978 | /** | 2977 | /** |
| 2979 | * 完成移库任务 | 2978 | * 完成移库任务 |
| 2980 | - * | ||
| 2981 | - * @param taskHeader 任务 | ||
| 2982 | - * @return Result 完成移库任务结果 | 2979 | + * @param taskHeader 任务 |
| 2980 | + * @return Result 完成移库任务结果 | ||
| 2983 | */ | 2981 | */ |
| 2984 | @Override | 2982 | @Override |
| 2985 | @Transactional(rollbackFor = Exception.class) | 2983 | @Transactional(rollbackFor = Exception.class) |
| @@ -3006,7 +3004,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3006,7 +3004,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3006 | List<InventoryTransaction> inventoryTransactionList = new ArrayList<>(); | 3004 | List<InventoryTransaction> inventoryTransactionList = new ArrayList<>(); |
| 3007 | LambdaUpdateWrapper<InventoryDetail> inventoryDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate(); | 3005 | LambdaUpdateWrapper<InventoryDetail> inventoryDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate(); |
| 3008 | inventoryDetailLambdaUpdateWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getContainerCode, containerCode) | 3006 | inventoryDetailLambdaUpdateWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getContainerCode, containerCode) |
| 3009 | - .eq(InventoryDetail::getLocationCode, fromLocationCode); | 3007 | + .eq(InventoryDetail::getLocationCode, fromLocationCode); |
| 3010 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaUpdateWrapper); | 3008 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaUpdateWrapper); |
| 3011 | for (InventoryDetail inventoryDetail : inventoryDetailList) { | 3009 | for (InventoryDetail inventoryDetail : inventoryDetailList) { |
| 3012 | inventoryDetail.setLocationCode(toLocationCode); | 3010 | inventoryDetail.setLocationCode(toLocationCode); |
| @@ -3037,7 +3035,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3037,7 +3035,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3037 | } | 3035 | } |
| 3038 | } | 3036 | } |
| 3039 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_TRANSFER, | 3037 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_TRANSFER, |
| 3040 | - containerCode, fromLocationCode, toLocationCode, warehouseCode); | 3038 | + containerCode, fromLocationCode, toLocationCode, warehouseCode); |
| 3041 | if (!result.isSuccess()) { | 3039 | if (!result.isSuccess()) { |
| 3042 | throw new JeecgBootException(result.getMessage()); | 3040 | throw new JeecgBootException(result.getMessage()); |
| 3043 | } | 3041 | } |
| @@ -3051,9 +3049,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3051,9 +3049,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3051 | 3049 | ||
| 3052 | /** | 3050 | /** |
| 3053 | * 完成出库查看任务 | 3051 | * 完成出库查看任务 |
| 3054 | - * | ||
| 3055 | - * @param taskHeader 任务 | ||
| 3056 | - * @return Result 完成出库查看任务结果 | 3052 | + * @param taskHeader 任务 |
| 3053 | + * @return Result 完成出库查看任务结果 | ||
| 3057 | */ | 3054 | */ |
| 3058 | @Override | 3055 | @Override |
| 3059 | @Transactional(rollbackFor = Exception.class) | 3056 | @Transactional(rollbackFor = Exception.class) |
| @@ -3084,7 +3081,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3084,7 +3081,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3084 | boolean success = false; | 3081 | boolean success = false; |
| 3085 | LambdaUpdateWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaUpdate(); | 3082 | LambdaUpdateWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaUpdate(); |
| 3086 | inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getContainerCode, containerCode) | 3083 | inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getContainerCode, containerCode) |
| 3087 | - .eq(InventoryDetail::getLocationCode, fromLocationCode); | 3084 | + .eq(InventoryDetail::getLocationCode, fromLocationCode); |
| 3088 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); | 3085 | List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); |
| 3089 | if (inventoryDetailList.size() != 0) { | 3086 | if (inventoryDetailList.size() != 0) { |
| 3090 | List<InventoryDetail> inventoryDetailList1 = new ArrayList<>(); | 3087 | List<InventoryDetail> inventoryDetailList1 = new ArrayList<>(); |
| @@ -3111,7 +3108,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3111,7 +3108,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3111 | } | 3108 | } |
| 3112 | 3109 | ||
| 3113 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_CHECK_OUT, | 3110 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_CHECK_OUT, |
| 3114 | - containerCode, fromLocationCode, toLocationCode, warehouseCode); | 3111 | + containerCode, fromLocationCode, toLocationCode, warehouseCode); |
| 3115 | if (!result.isSuccess()) { | 3112 | if (!result.isSuccess()) { |
| 3116 | throw new JeecgBootException(result.getMessage()); | 3113 | throw new JeecgBootException(result.getMessage()); |
| 3117 | } | 3114 | } |
| @@ -3126,9 +3123,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3126,9 +3123,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3126 | 3123 | ||
| 3127 | /** | 3124 | /** |
| 3128 | * 完成跨站任务 | 3125 | * 完成跨站任务 |
| 3129 | - * | ||
| 3130 | - * @param taskHeader 任务 | ||
| 3131 | - * @return Result 完成跨站任务结果 | 3126 | + * @param taskHeader 任务 |
| 3127 | + * @return Result 完成跨站任务结果 | ||
| 3132 | */ | 3128 | */ |
| 3133 | @Override | 3129 | @Override |
| 3134 | @Transactional(rollbackFor = Exception.class) | 3130 | @Transactional(rollbackFor = Exception.class) |
| @@ -3163,7 +3159,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3163,7 +3159,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3163 | return Result.error("创建跨站任务时，目标站台为空"); | 3159 | return Result.error("创建跨站任务时，目标站台为空"); |
| 3164 | } | 3160 | } |
| 3165 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_OVER_STATION, | 3161 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_OVER_STATION, |
| 3166 | - containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode); | 3162 | + containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode); |
| 3167 | if (!result.isSuccess()) { | 3163 | if (!result.isSuccess()) { |
| 3168 | throw new JeecgBootException(result.getMessage()); | 3164 | throw new JeecgBootException(result.getMessage()); |
| 3169 | } | 3165 | } |
| @@ -3178,9 +3174,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3178,9 +3174,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3178 | 3174 | ||
| 3179 | /** | 3175 | /** |
| 3180 | * 完成空托盘组入库任务 | 3176 | * 完成空托盘组入库任务 |
| 3181 | - * | ||
| 3182 | - * @param taskHeader 任务 | ||
| 3183 | - * @return Result 完成空托盘组入库任务结果 | 3177 | + * @param taskHeader 任务 |
| 3178 | + * @return Result 完成空托盘组入库任务结果 | ||
| 3184 | */ | 3179 | */ |
| 3185 | @Override | 3180 | @Override |
| 3186 | @Transactional(rollbackFor = Exception.class) | 3181 | @Transactional(rollbackFor = Exception.class) |
| @@ -3207,7 +3202,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3207,7 +3202,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3207 | return Result.error("完成空托盘组入库任务时，没有找到库位" + toLocationCode); | 3202 | return Result.error("完成空托盘组入库任务时，没有找到库位" + toLocationCode); |
| 3208 | } | 3203 | } |
| 3209 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT, | 3204 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT, |
| 3210 | - containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode); | 3205 | + containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode); |
| 3211 | if (!result.isSuccess()) { | 3206 | if (!result.isSuccess()) { |
| 3212 | throw new JeecgBootException(result.getMessage()); | 3207 | throw new JeecgBootException(result.getMessage()); |
| 3213 | } | 3208 | } |
| @@ -3222,9 +3217,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3222,9 +3217,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3222 | 3217 | ||
| 3223 | /** | 3218 | /** |
| 3224 | * 完成空托盘组出库任务 | 3219 | * 完成空托盘组出库任务 |
| 3225 | - * | ||
| 3226 | - * @param taskHeader 任务 | ||
| 3227 | - * @return Result 完成空托盘组出库任务结果 | 3220 | + * @param taskHeader 任务 |
| 3221 | + * @return Result 完成空托盘组出库任务结果 | ||
| 3228 | */ | 3222 | */ |
| 3229 | @Override | 3223 | @Override |
| 3230 | @Transactional(rollbackFor = Exception.class) | 3224 | @Transactional(rollbackFor = Exception.class) |
| @@ -3269,7 +3263,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3269,7 +3263,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3269 | throw new JeecgBootException("完成空托盘组出库任务时, 更新任务失败"); | 3263 | throw new JeecgBootException("完成空托盘组出库任务时, 更新任务失败"); |
| 3270 | } | 3264 | } |
| 3271 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT, | 3265 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT, |
| 3272 | - containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode); | 3266 | + containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode); |
| 3273 | if (!result.isSuccess()) { | 3267 | if (!result.isSuccess()) { |
| 3274 | throw new JeecgBootException(result.getMessage()); | 3268 | throw new JeecgBootException(result.getMessage()); |
| 3275 | } | 3269 | } |
| @@ -3408,7 +3402,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3408,7 +3402,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3408 | } | 3402 | } |
| 3409 | } | 3403 | } |
| 3410 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_QUALITY, | 3404 | Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_QUALITY, |
| 3411 | - containerCode, fromLocationCode, toLocationCode, warehouseCode); | 3405 | + containerCode, fromLocationCode, toLocationCode, warehouseCode); |
| 3412 | if (!result.isSuccess()) { | 3406 | if (!result.isSuccess()) { |
| 3413 | throw new JeecgBootException(result.getMessage()); | 3407 | throw new JeecgBootException(result.getMessage()); |
| 3414 | } | 3408 | } |
| @@ -3422,9 +3416,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3422,9 +3416,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3422 | 3416 | ||
| 3423 | /** | 3417 | /** |
| 3424 | * 取消入库任务 | 3418 | * 取消入库任务 |
| 3425 | - * | ||
| 3426 | - * @param taskHeader 任务 | ||
| 3427 | - * @return Result 取消入库任务结果 | 3419 | + * @param taskHeader 任务 |
| 3420 | + * @return Result 取消入库任务结果 | ||
| 3428 | */ | 3421 | */ |
| 3429 | @Override | 3422 | @Override |
| 3430 | @Transactional(rollbackFor = Exception.class) | 3423 | @Transactional(rollbackFor = Exception.class) |
| @@ -3443,9 +3436,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3443,9 +3436,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3443 | 3436 | ||
| 3444 | /** | 3437 | /** |
| 3445 | * 取消出库任务 | 3438 | * 取消出库任务 |
| 3446 | - * | ||
| 3447 | - * @param taskHeader 任务 | ||
| 3448 | - * @return Result 取消出库任务结果 | 3439 | + * @param taskHeader 任务 |
| 3440 | + * @return Result 取消出库任务结果 | ||
| 3449 | */ | 3441 | */ |
| 3450 | @Override | 3442 | @Override |
| 3451 | @Transactional(rollbackFor = Exception.class) | 3443 | @Transactional(rollbackFor = Exception.class) |
| @@ -3467,7 +3459,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3467,7 +3459,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3467 | log.info("开始取消盘点任务"); | 3459 | log.info("开始取消盘点任务"); |
| 3468 | LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery(); | 3460 | LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 3469 | cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getContainerCode, taskHeader.getContainerCode()).ne(CycleCountDetail::getEnableStatus, | 3461 | cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getContainerCode, taskHeader.getContainerCode()).ne(CycleCountDetail::getEnableStatus, |
| 3470 | - QuantityConstant.SHIPMENT_RECEIVE_SUCCESS); | 3462 | + QuantityConstant.SHIPMENT_RECEIVE_SUCCESS); |
| 3471 | CycleCountDetail cycleCountDetail = cycleCountDetailService.getOne(cycleCountDetailLambdaQueryWrapper); | 3463 | CycleCountDetail cycleCountDetail = cycleCountDetailService.getOne(cycleCountDetailLambdaQueryWrapper); |
| 3472 | if (cycleCountDetail == null) { | 3464 | if (cycleCountDetail == null) { |
| 3473 | throw new JeecgBootException("取消盘点任务，没有找到盘点明细"); | 3465 | throw new JeecgBootException("取消盘点任务，没有找到盘点明细"); |
| @@ -3523,8 +3515,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3523,8 +3515,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3523 | 3515 | ||
| 3524 | /** | 3516 | /** |
| 3525 | * 取消任务，恢复容器和库位状态 | 3517 | * 取消任务，恢复容器和库位状态 |
| 3526 | - * | ||
| 3527 | - * @param taskHeader | 3518 | + * @param taskHeader |
| 3528 | * @return | 3519 | * @return |
| 3529 | */ | 3520 | */ |
| 3530 | @Override | 3521 | @Override |
| @@ -3576,7 +3567,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -3576,7 +3567,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
| 3576 | public boolean updateById(TaskHeader taskHeader) { | 3567 | public boolean updateById(TaskHeader taskHeader) { |
| 3577 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); | 3568 | LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 3578 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeader.getId()).lt(taskHeader.getStatus() != null, TaskHeader::getStatus, | 3569 | taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeader.getId()).lt(taskHeader.getStatus() != null, TaskHeader::getStatus, |
| 3579 | - QuantityConstant.TASK_STATUS_COMPLETED); | 3570 | + QuantityConstant.TASK_STATUS_COMPLETED); |
| 3580 | return super.update(taskHeader, taskHeaderLambdaQueryWrapper); | 3571 | return super.update(taskHeader, taskHeaderLambdaQueryWrapper); |
| 3581 | } | 3572 | } |
| 3582 | 3573 |