打开上报接口

zc

2025-10-31 044ee513806026dc94c8c82cd79b7d2744b704e6

打开上报接口

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java

@@ -237,23 +237,21 @@
        log.info("已完成订单上传：{}， 请求参数： {}", rcsUrl, httpEntity.getBody());

        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("已完成订单上传，请求结果： {}", exchange);
        log.info("已完成订单上传，请求结果： {}", exchange.getBody());
        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("上传失败！！");
        } else {
            ObjectMapper objectMapper = new ObjectMapper();
            objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
            try {
                CommonResponse commonResponse = new CommonResponse();
                ErpCommonResponse result = objectMapper.readValue(exchange.getBody(), ErpCommonResponse.class);
                if (!result.getIsError()) {
                    commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
                    return commonResponse;
                } else {
                    throw new CoolException("上传失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
//            ObjectMapper objectMapper = new ObjectMapper();
//            objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
            CommonResponse commonResponse = new CommonResponse();
////
//                ErpCommonResponse result = objectMapper.readValue(exchange.getBody(), ErpCommonResponse.class);
            ErpCommonResponse result = JSONObject.parseObject(exchange.getBody(), ErpCommonResponse.class);
            if (!result.getIsError()) {
                commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
                return commonResponse;
            } else {
                throw new CoolException("上传失败！！");
            }
        }
    }

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java

@@ -44,7 +44,21 @@
        }

        return reportMsgService.uploadReportOrders(params);
    }

    @ApiOperation("完成订单上报")
    @PostMapping("/orders/check/update")
    public R checkReport(@RequestBody ReportParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        if (Objects.isNull(params.getOrderType())) {
            return R.error("订单类型不能为空！！");
        }
        if (Objects.isNull(params.getAction()) || params.getAction().isEmpty()) {
            return R.error("上报明细不能为空！！");
        }
        return reportMsgService.uploadCheckOrder(params);
    }

}

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

@@ -18,4 +18,6 @@
    boolean reportInspectNotify(List<PoItemsDto> items);

    R uploadReportOrders(ReportParams params);

    R uploadCheckOrder(ReportParams params);
}

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

@@ -19,10 +19,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

@Service
@@ -120,17 +117,17 @@
            if (Cools.isEmpty(waveOrderRelas)) {
                throw new CoolException("波次对应关联单未找到");
            }
            List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
            Set<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
            ArrayList<WkOrderItem> list = new ArrayList<>();
            List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
            for (WkOrder wkOrder : wkOrderList) {
                WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
                List<WkOrderItem> orderItem = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, wkOrder.getId())
                        .eq(StringUtils.isNotEmpty(taskItem.getMatnrCode()), WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
                        .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch())
//                        .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch())
                );
                if (null != orderItem) {
                    list.add(orderItem);
                    list.addAll(orderItem);
                }
            }
            containerWaveDto.setWkOrderItems(list);

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

@@ -433,6 +433,11 @@
                        .setUpdateTime(new Date())
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId);

                if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
                    wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
                }

                if (!asnOrderService.save(wkOrder)) {
                    throw new CoolException("单据保存失败！！");
                }

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

@@ -214,4 +214,15 @@
            }
        }
    }

    /**
     * 库存数据修改
     * @param params
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R uploadCheckOrder(ReportParams params) {
        return null;
    }
}