Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into ...

skyouc

1 天以前 561728125973f6ea4f022fbfae3b747f7650a704

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

@@ -578,19 +578,7 @@
                throw new CoolException("任务历史档保存失败！！");
            }
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
            //入库单据明细上报
//            if (order.getType().equals(OrderType.ORDER_OUT.type)) {
//                try {
//                    //上报已完成订单至ERP、MES等三方系统
//                    reportMsgService.reportOrders(order);
//                    order.setReportOnce(order.getReportOnce() + 1);
//                    if (!asnOrderService.updateById(order)) {
//                        log.error(order.getCode() + "，单据上传次数修改失败！！");
//                    }
//                } catch (Exception e) {
//                    log.error(e.getMessage());
//                }
//            }

            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                for (TaskItem taskItem : taskItems) {
                    if (Objects.isNull(taskItem.getOrderId())) {
@@ -610,8 +598,8 @@
                    /**入库单明细上报*/
                    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>()
@@ -624,24 +612,20 @@
                if (wkOrders.isEmpty()) {
                    throw new CoolException("单据不存在！！");
                }

//                Set<String> codes = taskItems.stream().map(TaskItem::getMatnrCode).collect(Collectors.toSet());
//                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
//                        .in(WkOrderItem::getMatnrCode, codes)
//                        .in(WkOrderItem::getOrderId, 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);