#

lty

7 天以前 d8cbd9c0b6ae133dc0cf09488f124d66296e70ee

#

 src/main/java/com/zy/asrs/task/handler/OrderReportHander.java

@@ -33,11 +33,11 @@
    //端口
    private String URL;

    @Value("${erp.address.inaddressSave}")
    //上报入库地址
    private String inaddressSave;
//    @Value("${erp.address.inaddressSave}")
//    //上报入库地址
//    private String inaddressSave;
    @Value("${erp.address.outaddressSave}")
    //上报出库地址
    //上报出入库地址
    private String outaddressSave;
    @Autowired
    private OrderService orderService;
@@ -70,12 +70,15 @@

            // 如果有符合条件的数据，执行上报
            if (!toReportList.isEmpty()) {
                reportPakIn(toReportList);

                for (OrderDetl detl : toReportList) {
                    detl.setMemo("1");
                    orderDetlService.updateById(detl);
                    log.info("已完成单据上报 =====> " + detl);
                boolean flag = reportPakIn(toReportList);
                if(flag){
                    for (OrderDetl detl : toReportList) {
                        detl.setMemo("1");
                        orderDetlService.updateById(detl);
                        log.info("已完成单据上报 =====> " + detl);
                    }
                } else {
                    log.warn("入库上报失败，未更新明细 memo 标志");
                }
            }
        }
@@ -83,7 +86,7 @@
        return SUCCESS;
    }

    private void reportPakIn(List<OrderDetl> orderDetls) {
    private boolean reportPakIn(List<OrderDetl> orderDetls) {

        Date now = new Date();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -126,7 +129,7 @@
            response = new HttpHandler.Builder()
                    .setHeaders(headers)
                    .setUri(URL)
                    .setPath(inaddressSave) // 设置你的接口路径
                    .setPath(outaddressSave) // 设置你的接口路径
                    .setJson(requestBody.toJSONString())
                    .build()
                    .doPost();
@@ -144,7 +147,7 @@
            try {
                apiLogService.save(
                        "入库上报",
                        URL + inaddressSave,
                        URL + outaddressSave,
                        null,
                        "127.0.0.1",
                        requestBody.toJSONString(),
@@ -155,6 +158,7 @@
                log.error("日志保存失败", e);
            }
        }
        return success;
    }

    public ReturnT<String> startPakOut() {
@@ -177,12 +181,15 @@

            // 如果有符合条件的数据，执行上报
            if (!toReportList.isEmpty()) {
                reportPakOut(toReportList);

                for (OrderDetl detl : toReportList) {
                    detl.setMemo("1");
                    orderDetlService.updateById(detl);
                    log.info("已完成单据上报 =====> " + detl);
                boolean flag = reportPakOut(toReportList);
                if(flag){
                    for (OrderDetl detl : toReportList) {
                        detl.setMemo("1");
                        orderDetlService.updateById(detl);
                        log.info("已完成单据上报 =====> " + detl);
                    }
                } else {
                    log.warn("出库上报失败，未更新明细 memo 标志");
                }
            }
        }
@@ -190,7 +197,7 @@
        return SUCCESS;
    }

    private void reportPakOut(List<OrderDetl> orderDetls) {
    private boolean reportPakOut(List<OrderDetl> orderDetls) {

        Date now = new Date();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -233,7 +240,7 @@
            response = new HttpHandler.Builder()
                    .setHeaders(headers)
                    .setUri(URL)
                    .setPath(inaddressSave) // 设置你的接口路径
                    .setPath(outaddressSave) // 设置你的接口路径
                    .setJson(requestBody.toJSONString())
                    .build()
                    .doPost();
@@ -262,6 +269,7 @@
                log.error("日志保存失败", e);
            }
        }
        return success;
    }

    public static Object findValueByKey(JSONObject json, String key) {