#订单导入上限增加

lty

3 天以前 d45fd7768ac59fb44e65ce574aaf9fda1489488b

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

@@ -15,9 +15,7 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.entity.result.ZphjcdgzVo;
import com.zy.asrs.entity.result.ZphjcdwcVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.MesConstant;
@@ -37,6 +35,7 @@

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

/**
@@ -107,6 +106,12 @@

    @Resource
    private ConfigMapper configMapper;

    @Resource
    private OrderMapper orderMapper;

    @Resource
    private BasCrnpMapper basCrnpMapper;

    @Override
    @Transactional
@@ -1021,29 +1026,27 @@

    @Override
    @Transactional
    public void prodCheck(List<ProdCheckParam> param) {
    public R prodCheck(List<ProdCheckParam> param) {
        if (param.isEmpty()) {
            throw new CoolException("请求参数不能为空");
            return R.parse("请求参数不能为空");
        }
        for (ProdCheckParam checkParam : param) {
            // 更新库存明细是否合格
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", checkParam.getRollNo()));
            // 更新商品表是否合格
            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            if (locDetl == null || mat == null) {
//            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("model", checkParam.getRollNo()));
            if (locDetl == null) { //  || mat == null
                throw new CoolException("更新是否合格物料不存在：" + checkParam);
            }

            locDetl.setThreeCode(checkParam.getQualified());
            mat.setThreeCode(checkParam.getQualified());
//            mat.setThreeCode(checkParam.getQualified());

            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            matService.update(mat,(new EntityWrapper<Mat>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo())));
            locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("model", checkParam.getRollNo()));
//            matService.update(mat, (new EntityWrapper<Mat>().eq("model", checkParam.getRollNo())));
        }

        return R.ok("更新成功");
    }

    @Override
@@ -1244,6 +1247,7 @@
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setWhsType(iotype == 1 && param.getPalletizingNo() == 2051 ? 1 : 0); // 返修入库标记
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：设备上走
        wrkMast.setIoType(iotype); // 入出库状态：1.入库
@@ -1390,7 +1394,7 @@
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                param.getCustomerName(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -1413,7 +1417,7 @@
                now,    // 添加时间
                9527L,    // 修改人员
                now,    // 修改时间
                null    // 备注
                param.getMemo()    // 备注
        );

        if (!orderService.insert(order)) {
@@ -1549,7 +1553,7 @@
                    .setHeaders(headers)
                    .setJson(body)
                    .build()
                    .doGet();
                    .doPost();
            if (!Cools.isEmpty(response)) {
                JSONObject jsonObject1 = JSONObject.parseObject(response);
                int code = (int) jsonObject1.get("code");
@@ -1961,6 +1965,86 @@

    }

    @Override
    public R getUnfulfilledOrders() {
        // 获取未完成订单统计信息
        List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders("");
        return R.ok(unfulfilledOrders);
    }

    @Override
    public R getCrnLaneWayInfo() {
        List<CrnLaneWayInfoDto> crnLaneWayInfo = basCrnpMapper.getCrnLaneWayInfo();
        return R.ok(crnLaneWayInfo);
    }

    @Override
    public R getOutLocInfoByBarcode(String barcode) {

        // 根据托盘码获取任务主档
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (wrkMast == null) {
            return R.parse("该条码无正在执行任务：" + barcode);
        }
        // 根据任务主档获取工作档明细
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        // 提取包装组号
        List<String> brandList = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
        OutLocInfoDto outLocInfoDto = new OutLocInfoDto();
        outLocInfoDto.setWrkNo(wrkMast.getWrkNo());
        List<OutLocInfoDto.Material> materialList = new ArrayList<>();
        for (String brand : brandList) {
            // 一个木箱
            OutLocInfoDto.Material material = new OutLocInfoDto.Material();
            material.setPackageGroupNo(brand); // 包装组号
            // 按包装组号过滤
            List<WrkDetl> wrkDetls1 = wrkDetls.stream().filter(wrkDetl -> Objects.equals(wrkDetl.getBrand(), brand)).collect(Collectors.toList());
            // 卷信息
            List<OutLocInfoDto.Material.MaterialDetail> materialDetailList = new ArrayList<>();
            for (WrkDetl wrkDetl : wrkDetls1) {
                OutLocInfoDto.Material.MaterialDetail materialDetail = new OutLocInfoDto.Material.MaterialDetail();
                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);
            }
            // 订单信息
            WrkDetl wrkDetl = wrkDetls1.get(0);
            if (wrkDetl != null && wrkDetl.getOrderNo() != null) {
                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());
                    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());
                    }
                }
            }

            material.setMaterialDetailList(materialDetailList);
            materialList.add(material);
        }
        outLocInfoDto.setMaterialList(materialList);

        return R.ok(outLocInfoDto);
    }

    /**
     * 创建桁架理货出库的工作档
     */
@@ -2012,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",
@@ -2053,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 ");