#

Administrator

2025-07-15 2f1b55f10742f94c3362dc3f61333251b713ee61

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

@@ -1148,6 +1148,13 @@
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3).eq("in_enable","Y")
                    .eq("out_enable","Y"));
        }
        WrkMast exist = wrkMastService.selectOne(
                new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", 3));
        if (exist != null) {
            return R.error("任务已存在，不可重复提交");
        }
        if (basCrnps.isEmpty()) {
            throw new CoolException("没有可用堆垛机,堆垛机停止或异常或禁用");
        }
@@ -1491,8 +1498,14 @@
            wrkMastService.updateById(wrkMast);
        }

        // 出库上报推送mes记录
        ckjgsbPushMes(wrkMast,wrkDetls);
        if(!wrkDetls.get(0).getMatnr().equals("空箱")){
            // 出库上报推送mes记录
            ckjgsbPushMes(wrkMast,wrkDetls);
        }else{
            wrkMast.setWrkSts(14L);
            wrkMastService.updateById(wrkMast);
        }


        return "出库结果上报成功";
    }
@@ -2006,6 +2019,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);
            }
@@ -2015,14 +2037,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());
                    }
                }
            }
@@ -2088,7 +2111,7 @@

    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo, String barcode, String message) {
        int maxRetry = 3;       // 最多重试 3 次
        long retryDelay = 3000; // 重试间隔 3 秒
        long retryDelay = 10000; // 重试间隔 10 秒
        boolean finalSuccess = false;

        Map<String, Object> headers = getHeaders();
@@ -2110,7 +2133,7 @@
                        .setPath(MesConstant.GWCS_FPKW_URL)
                        .setHeaders(headers)
                        .setJson(body)
                        .setTimeout(15, TimeUnit.SECONDS) // 设置连接 + 读取超时为15秒
                        .setTimeout(30, TimeUnit.SECONDS) // 设置连接 + 读取超时为30秒
                        .build()
                        .doPost();

@@ -2119,7 +2142,7 @@
                    try {
                        JSONObject resJson = JSON.parseObject(response);
                        int code = resJson.getIntValue("code"); // 视具体接口而定
                        if (code == 0) {
                        if (code == 200) {
                            success = true;
                            finalSuccess = true;
                            log.info("{} 成功，响应：{}", attemptMsg, response);