#生成入库任务优化

zjj

昨天 da20b84fb1dbb266939deff9fd52f9a16f4e32fa

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java

@@ -25,10 +25,12 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

@Service
public class WcsServiceImpl implements WcsService {
@@ -54,62 +56,138 @@
    private WaitPakinItemService waitPakinItemService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public InTaskMsgDto createInTask(TaskInParam param, Long loginUserId) {
        // 获取库位号
        InTaskMsgDto locNo = getLocNo(param);

        // 验证设备站点
        DeviceSite deviceSite = validateDeviceSite(param);

        // 验证组拖状态
        WaitPakin waitPakin = validateWaitPakin(param.getBarcode());

        // 生成任务编码
        String ruleCode = generateTaskCode();

        // 创建并保存任务
        Task task = createTask(ruleCode, locNo.getLocNo(), waitPakin.getBarcode(),
                deviceSite.getDeviceSite(), param.getSourceStaNo().toString(), loginUserId);

        // 更新库位状态
        updateLocStatus(task.getTargLoc(), waitPakin.getBarcode());

        // 获取并验证组拖明细
        List<WaitPakinItem> waitPakinItems = getWaitPakinItems(waitPakin.getId());

        // 创建并保存任务明细
        saveTaskItems(task.getId(), waitPakinItems, loginUserId);

        // 更新组托状态
        updateWaitPakinStatus(param.getBarcode(), loginUserId);

        // 设置工作单号并返回
        locNo.setWorkNo(ruleCode);
        return locNo;
    }

    /**
     * 验证设备站点
     */
    private DeviceSite validateDeviceSite(TaskInParam param) {
        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
                .eq(DeviceSite::getSite, param.getSourceStaNo())
                .eq(DeviceSite::getType,param.getIoType())
        );
                .eq(DeviceSite::getType, param.getIoType()));

        if (Objects.isNull(deviceSite)) {
            throw new CoolException("站点不存在！！");
        }
        return deviceSite;
    }

    /**
     * 验证组拖状态
     */
    private WaitPakin validateWaitPakin(String barcode) {
        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, param.getBarcode())
                .eq(WaitPakin::getBarcode, barcode)
                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));

        if (Cools.isEmpty(waitPakin)) {
            throw new CoolException("请检查组拖状态是否完成！！");
        }
        return waitPakin;
    }

            List<TaskItem> taskItems = new ArrayList<>();
    /**
     * 生成任务编码
     */
    private String generateTaskCode() {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("编码错误：请确认编码「SYS_TASK_CODE」是否已生成!!");
            }
        return ruleCode;
    }

    /**
     * 创建并保存任务
     */
    private Task createTask(String ruleCode, String targetLoc, String barcode,
                            String targetSite, String sourceSiteNo, Long loginUserId) {
            Task task = new Task();
            task.setTaskCode(ruleCode)
                    .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
                    .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
                    .setTargLoc(locNo.getLocNo())
                    .setBarcode(waitPakin.getBarcode())
                    .setTargSite(deviceSite.getDeviceSite())
                .setTargLoc(targetLoc)
                .setBarcode(barcode)
                .setTargSite(targetSite)
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setOrgSite(param.getSourceStaNo().toString());



                .setOrgSite(sourceSiteNo);

            if (!taskService.save(task)) {
                throw new CoolException("任务保存失败！！");
            }
            if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())
                    .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, waitPakin.getBarcode()))) {
        return task;
    }

    /**
     * 更新库位状态
     */
    private void updateLocStatus(String locCode, String barcode) {
        boolean updated = locService.update(new LambdaUpdateWrapper<Loc>()
                .eq(Loc::getCode, locCode)
                .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type)
                .set(Loc::getBarcode, barcode));

        if (!updated) {
                throw new CoolException("库位预约失败！！");
            }
            /**获取组拖明细**/
            List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
    }

    /**
     * 获取并验证组拖明细
     */
    private List<WaitPakinItem> getWaitPakinItems(Long pakinId) {
        List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(
                new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakinId));

            if (waitPakinItems.isEmpty()) {
                throw new CoolException("数据错误：组拖明细不存在");
            }
            waitPakinItems.forEach(item -> {
        return waitPakinItems;
    }

    /**
     * 创建并保存任务明细
     */
    private void saveTaskItems(Long taskId, List<WaitPakinItem> waitPakinItems, Long loginUserId) {
        List<TaskItem> taskItems = waitPakinItems.stream().map(item -> {
                TaskItem taskItem = new TaskItem();
                BeanUtils.copyProperties(item, taskItem);
//                AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
//                if (Objects.isNull(order)) {
//                    throw new CoolException("数据错误: 单据不存在！！");
//                }
                taskItem.setTaskId(task.getId())

            return taskItem.setTaskId(taskId)
                        .setOrderType(OrderType.ORDER_RECEIPT.type)
                        .setSource(item.getId())
                        .setTrackCode(item.getTrackCode())
@@ -117,24 +195,110 @@
                        .setUpdateBy(loginUserId)
                        .setOrderId(item.getAsnId())
                        .setOrderItemId(item.getAsnItemId());
                taskItems.add(taskItem);
            });
        }).collect(Collectors.toList());

            if (!taskItemService.saveBatch(taskItems)) {
                throw new CoolException("任务明细保存失败！！");
            }
    }


        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, param.getBarcode())
    /**
     * 更新组托状态
     */
    private void updateWaitPakinStatus(String barcode, Long loginUserId) {
        boolean updated = waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, barcode)
                .set(WaitPakin::getUpdateBy, loginUserId)
                .set(WaitPakin::getCreateBy, loginUserId)
                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val))) {
                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));

        if (!updated) {
            throw new CoolException("组托状态修改失败！！");
        }
        locNo.setWorkNo(ruleCode);
        return locNo;
    }

//    @Override
//    public InTaskMsgDto createInTask(TaskInParam param, Long loginUserId) {
//        InTaskMsgDto locNo = getLocNo(param);
//        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
//                .eq(DeviceSite::getSite, param.getSourceStaNo())
//                .eq(DeviceSite::getType,param.getIoType())
//        );
//        if (Objects.isNull(deviceSite)) {
//            throw new CoolException("站点不存在！！");
//        }
//
//        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
//                .eq(WaitPakin::getBarcode, param.getBarcode())
//                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));
//        if (Cools.isEmpty(waitPakin)) {
//            throw new CoolException("请检查组拖状态是否完成！！");
//        }
//
//            List<TaskItem> taskItems = new ArrayList<>();
//            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
//            if (StringUtils.isBlank(ruleCode)) {
//                throw new CoolException("编码错误：请确认编码「SYS_TASK_CODE」是否已生成!!");
//            }
//            Task task = new Task();
//            task.setTaskCode(ruleCode)
//                    .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
//                    .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
//                    .setTargLoc(locNo.getLocNo())
//                    .setBarcode(waitPakin.getBarcode())
//                    .setTargSite(deviceSite.getDeviceSite())
//                    .setCreateBy(loginUserId)
//                    .setUpdateBy(loginUserId)
//                    .setOrgSite(param.getSourceStaNo().toString());
//
//
//
//
//            if (!taskService.save(task)) {
//                throw new CoolException("任务保存失败！！");
//            }
//            if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())
//                    .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, waitPakin.getBarcode()))) {
//                throw new CoolException("库位预约失败！！");
//            }
//            /**获取组拖明细**/
//            List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
//            if (waitPakinItems.isEmpty()) {
//                throw new CoolException("数据错误：组拖明细不存在");
//            }
//            waitPakinItems.forEach(item -> {
//                TaskItem taskItem = new TaskItem();
//                BeanUtils.copyProperties(item, taskItem);
////                AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
////                if (Objects.isNull(order)) {
////                    throw new CoolException("数据错误: 单据不存在！！");
////                }
//                taskItem.setTaskId(task.getId())
//                        .setOrderType(OrderType.ORDER_RECEIPT.type)
//                        .setSource(item.getId())
//                        .setTrackCode(item.getTrackCode())
//                        .setCreateBy(loginUserId)
//                        .setUpdateBy(loginUserId)
//                        .setOrderId(item.getAsnId())
//                        .setOrderItemId(item.getAsnItemId());
//                taskItems.add(taskItem);
//            });
//            if (!taskItemService.saveBatch(taskItems)) {
//                throw new CoolException("任务明细保存失败！！");
//            }
//
//
//        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
//                .eq(WaitPakin::getBarcode, param.getBarcode())
//                .set(WaitPakin::getUpdateBy, loginUserId)
//                .set(WaitPakin::getCreateBy, loginUserId)
//                .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val))) {
//            throw new CoolException("组托状态修改失败！！");
//        }
//        locNo.setWorkNo(ruleCode);
//        return locNo;
//    }

    public InTaskMsgDto getLocNo(TaskInParam param) {
        String matnr = null; String batch = null;
        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getBarcode()));