diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index e8b3112e6..97311e099 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -251,7 +251,7 @@ public class HandoverTaskOrderDomainService { if (CollectionUtils.isEmpty(handoverTaskOrders)) { throw new ServiceException("作业单不存在或已下发,请重新选择"); } - //移位生成下发任务 + //交付生成下发任务 genDeliveTask(handoverTaskOrders, handoverTaskOrderDO); return handoverTaskOrderService.taskDistribution(handoverTaskOrderDO); } @@ -281,41 +281,6 @@ public class HandoverTaskOrderDomainService { deliveTaskDO.setCreateTime(new Date()); deliveTaskDOList.add(deliveTaskDO); } - } - - /** - * @description 移位生成任务下发 - * @author ZhouGY - * @date 2024/7/27 15:23 - * @param shiftManagePOList - * @param shiftManageDO - */ - @Transactional(rollbackFor = Exception.class) - public void genDeliveTask(List shiftManagePOList, ShiftManageDO shiftManageDO){ - LoginUser loginUser = SecurityUtils.getLoginUser(); - List deliveTaskDOList = new ArrayList<>(); - for (ShiftManagePO shiftManagePO : shiftManagePOList){ - DeliveTaskDO deliveTaskDO = new DeliveTaskDO(); - deliveTaskDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); - deliveTaskDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); - deliveTaskDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); - deliveTaskDO.setTaskNumber(OrderSequence.getOrderCode("RW")); - deliveTaskDO.setTrackingNumber(shiftManagePO.getShiftNumber()); - deliveTaskDO.setWarehouseId(shiftManagePO.getWarehouseId()); - deliveTaskDO.setWarehouseCode(shiftManagePO.getWarehouseCode()); - deliveTaskDO.setWarehouseName(shiftManagePO.getWarehouseName()); - deliveTaskDO.setTaskType(5); - deliveTaskDO.setTaskDistribution(1); - deliveTaskDO.setTaskDistributionId(loginUser.getUserid()); - deliveTaskDO.setTaskDistributionName(loginUser.getUsername()); - deliveTaskDO.setTaskDistributionTime(new Date()); - deliveTaskDO.setOperatorsBy(shiftManageDO.getOperatorsBy()); - deliveTaskDO.setOperatorsName(shiftManageDO.getOperatorsName()); - deliveTaskDO.setCreateBy(loginUser.getUserid()); - deliveTaskDO.setCreateByName(loginUser.getUsername()); - deliveTaskDO.setCreateTime(new Date()); - deliveTaskDOList.add(deliveTaskDO); - } deliveTaskService.batchInsert(deliveTaskDOList); }