skyouc
1 天以前 561728125973f6ea4f022fbfae3b747f7650a704
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -598,16 +598,8 @@
                    /**入库单明细上报*/
                    reportMsgService.reportOrderItem(wkOrderItem);
                }
            } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
                //出库单上报RCS修改库位状态
                try {
                    reportStationStatus(task);
                } catch (Exception e) {
                    throw new CoolException(e.getMessage());
                }
            }
            } 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>()
@@ -623,16 +615,24 @@
            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 (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);
                } catch (Exception e) {
                    throw new CoolException(e.getMessage());
                }
            }
            List<TaskItemLog> itemLogs = new ArrayList<>();
            for (TaskItem item : taskItems) {