Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

zc

2 天以前 2db2c1328008ae399d8d7af56c9c6dc67a47bce8

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

@@ -10,6 +10,7 @@
import com.vincent.rsf.openApi.config.PlatformProperties;
import com.vincent.rsf.openApi.entity.constant.WmsConstant;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.dto.ErpCommonResponse;
import com.vincent.rsf.openApi.entity.dto.OrderDto;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
@@ -80,7 +81,8 @@
                    result.setData(dto);
                    return result;
                } else {
                    throw new CoolException("查询失败！！");
                    return result;
//                    throw new CoolException("查询失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
@@ -236,21 +238,17 @@
        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 result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
                if (result.getCode() == 200) {
                    return result;
                } else {
                    throw new CoolException("上传失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
            CommonResponse commonResponse = new CommonResponse();
            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("上传失败！！");
            }
        }
    }
@@ -273,7 +271,6 @@
        headers.add("Content-Type", "application/json");
        headers.add("api-version", "v2.0");

        params.put("", "");
        HttpEntity httpEntity = new HttpEntity(params, headers);
        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("修改结果： {}", exchange);