#订单导入上限增加

lty

3 天以前 d45fd7768ac59fb44e65ce574aaf9fda1489488b

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -35,6 +35,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
@@ -2005,6 +2006,15 @@
                materialDetail.setRollNo(wrkDetl.getModel());
                materialDetail.setBoxNo(wrkDetl.getUnit());
                materialDetail.setSpecs(wrkDetl.getMatnr());
                materialDetail.setBoxType(wrkDetl.getColor());
                materialDetail.setCoreType(wrkDetl.getManu());
                materialDetail.setWidth(wrkDetl.getSku());
                materialDetail.setThickness(wrkDetl.getItemNum());
                materialDetail.setWeight(wrkDetl.getWeight());
                materialDetail.setLength(wrkDetl.getLength());
                materialDetail.setVolume(wrkDetl.getVolume());
                materialDetail.setCustomerName(wrkDetl.getSupp());
                materialDetail.setMemo(wrkDetl.getMemo());
                material.setBoxPos(wrkDetl.getOrigin()); // 托盘上木箱位置
                materialDetailList.add(materialDetail);
            }
@@ -2014,14 +2024,15 @@
                Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
                if (order != null) {
                    material.setOrderNo(order.getOrderNo());
                    material.setMemo(order.getMemo());
                    material.setCustomerName(order.getCstmrName());
//                    material.setMemo(order.getMemo());
//                    material.setCustomerName(order.getCstmrName());
                    List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders(order.getOrderNo());
                    if (unfulfilledOrders.size() == 1) {
                        OrderStatisticsDto orderStatisticsDto = unfulfilledOrders.get(0);
                        material.setSum(orderStatisticsDto.getSum());
                        material.setToShipQuantity(orderStatisticsDto.getToShipQuantity());
                        material.setWorkQuantity(orderStatisticsDto.getWorkQuantity());
                        material.setCompleteQuantity(orderStatisticsDto.getCompletedQuantity());
                    }
                }
            }
@@ -2085,39 +2096,60 @@
        return wrkDetls.size() > 1 ? 1 : 4; // 一条记录就是一卷
    }

    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode,String message) {
        boolean success = false;
        // 获取请求头
        Map<String, Object> headers = getHeaders();
    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo, String barcode, String message) {
        int maxRetry = 3;       // 最多重试 3 次
        long retryDelay = 10000; // 重试间隔 10 秒
        boolean finalSuccess = false;

        // 构造请求体
        Map<String, Object> headers = getHeaders();
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("workNo", workNo);
        jsonObject.put("staNo", staNo);
        jsonObject.put("sourceStaNo", palletizingNo);
        jsonObject.put("barcode", barcode);
        String body = jsonObject.toJSONString();
        String response = "";
        try {
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.GWCS_IP_PORT)
                    .setPath(MesConstant.GWCS_FPKW_URL)
                    .setHeaders(headers)
                    .setJson(body)
                    .build()
                    .doPost();
            if (!Cools.isEmpty(response)) {
                success = true;
            } else {
                log.error(message + "失败！！！url：{}；request：{}；response：{}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL, body, response);
            }
        } catch (Exception e) {
            log.error(message + "异常：{}", e);
        } finally {

        for (int attempt = 1; attempt <= maxRetry; attempt++) {
            String response = "";
            boolean success = false;
            String attemptMsg = message + "（第 " + attempt + " 次尝试）";

            try {
                // 保存接口日志
                response = new HttpHandler.Builder()
                        .setUri(MesConstant.GWCS_IP_PORT)
                        .setPath(MesConstant.GWCS_FPKW_URL)
                        .setHeaders(headers)
                        .setJson(body)
                        .setTimeout(30, TimeUnit.SECONDS) // 设置连接 + 读取超时为30秒
                        .build()
                        .doPost();


                if (!Cools.isEmpty(response)) {
                    try {
                        JSONObject resJson = JSON.parseObject(response);
                        int code = resJson.getIntValue("code"); // 视具体接口而定
                        if (code == 200) {
                            success = true;
                            finalSuccess = true;
                            log.info("{} 成功，响应：{}", attemptMsg, response);
                        } else {
                            log.warn("{} 响应失败，返回code={}，完整响应：{}", attemptMsg, code, response);
                        }
                    } catch (Exception parseEx) {
                        log.warn("{} 响应解析失败，内容：{}", attemptMsg, response);
                    }
                } else {
                    log.warn("{} 失败，响应为空", attemptMsg);
                }
            } catch (Exception e) {
                log.error("{} 异常：{}", attemptMsg, e.getMessage(), e);
            }

            // 每次都记录日志，不论成功或失败
            try {
                apiLogService.save(
                        message,
                        attemptMsg,
                        MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL,
                        null,
                        "127.0.0.1",
@@ -2126,12 +2158,27 @@
                        success
                );
            } catch (Exception e) {
                log.error("", e);
                log.error("保存接口日志异常：{}", e.getMessage(), e);
            }

            if (success) break; // 成功就不再重试

            // 如果还有下一次重试，则等待
            if (attempt < maxRetry) {
                try {
                    Thread.sleep(retryDelay);
                } catch (InterruptedException e) {
                    Thread.currentThread().interrupt();
                    break;
                }
            }
        }
        return success;

        return finalSuccess;
    }



    Map<String, Object> getHeaders(){
        Map<String,Object> headers = new HashMap<>();
        headers.put("digi-type","sync ");