换绑功能优化

skyouc

5 小时以前 a572f1428af7a5d6eeaf973363c33785ea182bd3

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -24,6 +24,7 @@
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocItemWorkingServiceImpl;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.manager.service.impl.WaveOrderRelaServiceImpl;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
@@ -99,6 +100,9 @@
    private ReportMsgService reportMsgService;
    @Autowired
    private WaveOrderRelaService waveOrderRelaService;
    @Autowired
    private LocItemWorkingService locItemWorkingService;


    /**
     * @param
@@ -598,8 +602,34 @@
                    /**入库单明细上报*/
                    reportMsgService.reportOrderItem(wkOrderItem);
                }
            } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {

            } else if ((task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
                /**判断单据是否完成**/
                Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
                List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
                        .in(WaveOrderRela::getWaveId, longSet));
                if (Cools.isEmpty(waveOrderRelas)) {
                    throw new CoolException("波次对应关联单未找到");
                }
                Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
                List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
                if (wkOrders.isEmpty()) {
                    throw new CoolException("单据不存在！！");
                }
                wkOrders.forEach(order -> {
                    //检查单据是否完成
                    if (order.getAnfme().compareTo(order.getQty()) == 0) {
                        order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
//                        if (order.getType().equals(OrderType.ORDER_IN)) {
//                            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
//                        } else {
//                            order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
//                        }
                        if (!asnOrderService.updateById(order)) {
                            throw new CoolException("出库单更新状态失败");
                        }
                    }
                });
                //出库单上报RCS修改库位状态
                try {
                    reportStationStatus(task);
@@ -607,32 +637,6 @@
                    throw new CoolException(e.getMessage());
                }
            }

            /**判断单据是否完成**/
            Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
            List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
                    .in(WaveOrderRela::getWaveId, longSet));
            if (Cools.isEmpty(waveOrderRelas)) {
                throw new CoolException("波次对应关联单未找到");
            }
            Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
            List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
            if (wkOrders.isEmpty()) {
                throw new CoolException("单据不存在！！");
            }
            wkOrders.forEach(order -> {
                //检查单据是否完成
                if (order.getAnfme().compareTo(order.getQty()) == 0) {
                    if (order.getType().equals(OrderType.ORDER_IN)) {
                        order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
                    } else {
                        order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
                    }
                    if (!asnOrderService.updateById(order)) {
                        throw new CoolException("出库单更新状态失败");
                    }
                }
            });

            List<TaskItemLog> itemLogs = new ArrayList<>();
            for (TaskItem item : taskItems) {
@@ -644,6 +648,9 @@
                        .setTaskItemId(item.getId());
                itemLogs.add(itemLog);
            }

            locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));


            if (!taskService.removeById(task.getId())) {
                throw new CoolException("原始任务删除失败！！");
@@ -657,6 +664,8 @@
                    throw new CoolException("原始任务明细删除失败！！");
                }
            }


        });
    }