出庫訂單完成上報功能優化

zc

1 天以前 5213d5c3bf7c4b60fbb308fdadfb84f6d999c38b

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

@@ -558,27 +558,25 @@
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
            //入库单据明细上报

            for (TaskItem taskItem : taskItems) {
                if (Objects.isNull(taskItem.getOrderId())) {
                    continue;
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
                for (TaskItem taskItem : taskItems) {
                    if (Objects.isNull(taskItem.getOrderId())) {
                        continue;
                    }
                    WkOrder order = asnOrderService.getById(taskItem.getOrderId());
                    if (Objects.isNull(order)) {
                        continue;
                    }
                    //入库单任务明细上报
                    WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                            .eq(WkOrderItem::getOrderId, order.getId())
                            .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
                    if (Objects.isNull(wkOrderItem)) {
                        throw new CoolException("数据错误，单据明细不存在或已完成！！");
                    }
                    /**入库单明细上报*/
                    reportMsgService.reportOrderItem(wkOrderItem);
                }
                WkOrder order = asnOrderService.getById(taskItem.getOrderId());
                if (Objects.isNull(order)) {
                    continue;
                }
                //入库单任务明细上报
                WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, order.getId())
                        .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
                if (Objects.isNull(wkOrderItem)) {
                    throw new CoolException("数据错误，单据明细不存在或已完成！！");
                }
                /**入库单明细上报*/
                reportMsgService.reportOrderItem(wkOrderItem);
            }

            if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {

            } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
                //出库单上报RCS修改库位状态
                try {
@@ -636,11 +634,9 @@
        }

        LocSiteParams locSiteParams = new LocSiteParams();
        locSiteParams
                .setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
        locSiteParams.setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
                .setType("site")
                .setCode(station.getStationName());

        /**WMS基础配置链接*/
        String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_SITE_STATUS;
        log.info("上报已完成订单：{}， 请求参数： {}", rcsUrl, JSONObject.toJSONString(locSiteParams));
@@ -651,6 +647,7 @@
        HttpEntity httpEntity = new HttpEntity(locSiteParams, headers);
        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("上报已完成订单，返回结果： {}", exchange);

        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("修改失败！！");
        } else {
@@ -663,7 +660,6 @@
                throw new CoolException(e.getMessage());
            }
        }

    }

}