skyouc
3 天以前 1e1c329535e3f3ce253c89ae1847476de9058f27
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.openApi.entity.dto.OrderDto;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
import com.vincent.rsf.openApi.entity.params.ReportParams;
import com.vincent.rsf.openApi.service.WmsErpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,7 +69,14 @@
                if (result.getCode() == 200) {
                    JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
                    OrderDto dto = new OrderDto();
                    dto.setOrderNo(object.getString("code")).setAnfme(object.getDouble("anfme")).setType(object.getString("type")).setWkType(object.getString("wkType")).setQty(object.getDouble("qty")).setPoCode(object.getString("poCode")).setExceStatus(object.getShort("exceStatus")).setWorkQty(object.getDouble("workQty"));
                    dto.setOrderNo(object.getString("code"))
                            .setAnfme(object.getDouble("anfme"))
                            .setType(object.getString("type"))
                            .setWkType(object.getString("wkType"))
                            .setQty(object.getDouble("qty"))
                            .setPoCode(object.getString("poCode"))
                            .setExceStatus(object.getShort("exceStatus"))
                            .setWorkQty(object.getDouble("workQty"));
                    result.setData(dto);
                    return result;
                } else {
@@ -215,22 +223,22 @@
     * @version 1.0
     */
    @Override
    public CommonResponse reportOrders(Map<String, Object> params) {
    public CommonResponse reportOrders(ReportParams params) {
        if (Objects.isNull(params)) {
            throw new CoolException("参数不能为空!!");
        }
        /**WMS基础配置链接*/
        String rcsUrl = erpApi.getHost() + ":" + erpApi.getPort() + WmsConstant.REPORT_ORDER_CALLBACK;
        log.info("物料修改:{}, 请求参数: {}", rcsUrl, JSONObject.toJSONString(params));
        HttpHeaders headers = new HttpHeaders();
        headers.add("Content-Type", "application/json");
        headers.add("api-version", "v2.0");
        HttpEntity httpEntity = new HttpEntity(params, headers);
        log.info("已完成订单上传:{}, 请求参数: {}", rcsUrl, httpEntity.getBody());
        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("修改结果: {}", exchange);
        log.info("已完成订单上传,请求结果: {}", exchange);
        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("修改失败!!");
            throw new CoolException("上传失败!!");
        } else {
            ObjectMapper objectMapper = new ObjectMapper();
            objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
@@ -239,7 +247,7 @@
                if (result.getCode() == 200) {
                    return result;
                } else {
                    throw new CoolException("修改失败!!");
                    throw new CoolException("上传失败!!");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());