lsh#

1

2 天以前 df08ca13ad69fd3908bfcd5f39f05f6c4ffb668a

lsh#

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/AuthController.java

@@ -30,7 +30,7 @@

    // 开启模拟数据
    @Value("${foreign.api.data.simulated}")
    public static String SIMULATED_DATA_ENABLE = "1";
    public static String SIMULATED_DATA_ENABLE = "0";

    @Resource
    private AppAuthService appAuthService;

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java

@@ -116,10 +116,16 @@
        JSONArray params = paramsFormat(objParams);
        List<Order> orderList = JSON.parseArray(params.toJSONString(), Order.class);
        // 数据处理，转发server
        StringBuffer errorMsg = new StringBuffer();
        for (Order order : orderList) {
            erpReportService.addOrderToServer(order);
            String i = erpReportService.addOrderToServer(order);
            if (i.equals("200")){
                errorMsg.append(order.getOrderNo()+"下发成功;");
            } else {
                errorMsg.append(order.getOrderNo()+"下发失败,原因："+i+";");
            }
        }
        return CommonResponse.ok();
        return CommonResponse.ok(errorMsg.toString());
    }

    @ApiOperation("入/出库任务通知单取消")

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/ErpReportService.java

@@ -9,7 +9,7 @@

public interface ErpReportService {

    int addOrderToServer(Order order);
    String addOrderToServer(Order order);

    JSONObject loginBySign() throws UnsupportedEncodingException, NoSuchAlgorithmException;


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

@@ -72,7 +72,7 @@



    public int addOrderToServer(Order order) {
    public String addOrderToServer(Order order) {
        if (Objects.isNull(order.getOrderNo()) || order.getOrderNo().isEmpty()) {
            throw new CoolException("订单号不能为空！！");
        }
@@ -98,8 +98,11 @@
        maps.add(mapParams);
        log.info("修改订单信息及状态： {}， 请求参数： {}", wmsUrl, JSONArray.toJSONString(maps));
        HttpEntity<List<Map<String, Object>>> httpEntity = new HttpEntity<>(maps, headers);
        ArrayList<Order> orders = new ArrayList<>();
        orders.add(order);
        HttpEntity httpEntity2 = new HttpEntity<>(orders, headers);//cs
        // asnOrder/items/save
        ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity, String.class);
        ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity2, String.class);//cs
        log.info("订单修改返回结果： {}", exchange);
        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("查询失败！！");
@@ -110,13 +113,13 @@
                CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
                if (result.getCode() == 200) {
//                    JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
                    return 1;
                    return "200";
                } else {
                    return 0;
                    return result.getMsg();
//                    throw new CoolException("查询失败！！");
                }
            } catch (JsonProcessingException e) {
                return 0;
                return e.getMessage();
//                throw new CoolException(e.getMessage());
            }
        }