no message

skyouc

20 小时以前 563ffc29857acd93c7298ddfca700c1fb01b18e0

no message

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

@@ -104,9 +104,9 @@
    }

    @ApiOperation("盘点差异修改")
    @PostMapping("/report/check")
    public CommonResponse reportCheck(@RequestBody Map<String, Object> params) {
        return wmsErpService.reportCheck(params);
    @PostMapping("/check/locitem/update")
    public CommonResponse reportCheck(@RequestBody ReportParams params) {
        return wmsErpService.reportOrders(params);
    }

}

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

@@ -241,11 +241,7 @@
        if (Objects.isNull(exchange.getBody())) {
            throw new CoolException("上传失败！！");
        } else {
//            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());
@@ -274,7 +270,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);

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

@@ -46,14 +46,11 @@
        return reportMsgService.uploadReportOrders(params);
    }

    @ApiOperation("完成订单上报")
    @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("上报明细不能为空！！");

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

@@ -49,6 +49,9 @@
    @ApiModelProperty("出库数量")
    private Double OutQty;

    @ApiModelProperty("库位")
    private String Zone;

    @ApiModelProperty("编辑用户")
    private String EditUser;


 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java

@@ -10,4 +10,7 @@

    //上报订单信息
    public static String REPORT_ORDERS = "/rsf-open-api/erp/report/order";

    //盘点库存修改
    public static String CHECK_LOCITEM_UPDATE = "/rsf-open-api/erp/check/locitem/update";
}

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

@@ -216,13 +216,43 @@
    }

    /**
     * 库存数据修改
     * 盘点库存数据修改
     * @param params
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R uploadCheckOrder(ReportParams params) {
        return null;
        if (Objects.isNull(params)) {
            throw new CoolException("参数不能为空！！");
        }
        /**WMS基础配置链接*/
        String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.CHECK_LOCITEM_UPDATE;
        log.info("盘点库存修改：{}， 请求参数： {}", rcsUrl, JSONObject.toJSONString(params));
        HttpHeaders headers = new HttpHeaders();
        headers.add("Content-Type", "application/json");
        headers.add("api-version", "v2.0");

        params.setAction("Update").setOrderType("PD_stock");

        HttpEntity httpEntity = new HttpEntity(params, headers);
        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("盘点库存修改，返回结果： {}", exchange);
        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 R.ok().add(result.getData());
                } else {
                    throw new CoolException("修改失败！！");
                }
            } catch (JsonProcessingException e) {
                throw new CoolException(e.getMessage());
            }
        }
    }
}

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

@@ -136,6 +136,7 @@
                //设置通用参数
                param.setWMSNO(order.getCode())
                        .setPONO(order.getPoCode())
                        .setOrderNO(order.getPoCode())
                        .setOrderDate(order.getCreateTime())
                        .setItemCode(orderItem.getMatnrCode())
                        .setEditUser(nickName)