#

Junjie

2025-07-16 3b3558434a76d6db3aaf640871e999b098da1ff8

#

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -94,8 +94,26 @@

    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    //@Scheduled(cron = "0/5 * * * * ? ")
    //@Async("orderThreadPool")
    public void completeAndReportOrderInAndOutUtil3() {
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
        List<Order> orders = OrderInAndOutUtil.selectComplete(null);
        for (Order order : orders) {
            try {
                ReturnT<String> result = orderSyncHandler.checkDBDD(order);
                if (!result.isSuccess()) {
                    log.error("集团内部调拨单据[orderNo={}]转上报表失败", order.getOrderNo());
                }
            } catch (Exception e) {
                e.printStackTrace();
                log.error("集团内部调拨单据[orderNo={}]转上报表失败", order.getOrderNo());
            }
        }
//        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReportOrderInAndOutUtil2() {
//        String erpReport = Parameter.get().getErpReport();
//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
@@ -104,11 +122,11 @@
            try {
                ReturnT<String> result = orderSyncHandler.checkXSFH(order);
                if (!result.isSuccess()) {
                    log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
                    log.error("销售发货单据[orderNo={}]转上报表失败", order.getOrderNo());
                }
            } catch (Exception e) {
                e.printStackTrace();
                log.error("单据[orderNo={}]转上报表失败", order.getOrderNo());
                log.error("销售发货单据[orderNo={}]转上报表失败", order.getOrderNo());
            }
        }
//        }

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

@@ -131,7 +131,7 @@
        if (null == docType) {
            return SUCCESS;
        }
        if (docType.getDocName().equals("销售发货")) {
        if (docType.getDocName().equals("销售发货") || docType.getDocName().equals("集团内部调拨")) {
            return SUCCESS;
        }
        Order orderSou = orderService.selectByNo(order.getOrderNo());
@@ -243,6 +243,74 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> checkDBDD(Order order) {
        DocType docType = docTypeService.selectById(order.getDocType());
        if (null == docType) {
            return SUCCESS;
        }
        if (!docType.getDocName().equals("集团内部调拨")) {
            return SUCCESS;
        }
        Order orderSou = orderService.selectByNo(order.getOrderNo());
        if (!orderSou.getSettle().equals(2L)) {
            return FAIL.setMsg("订单状态不正确，请联系管理员");
        }

        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
        boolean complete = true;
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getAnfme() > orderDetl.getQty()) {
                complete = false;
                break;
            }
        }
        if (complete) {
            List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
                throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
            for (WrkDetl wrkDetl : wrkDetls) {
                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(wrkDetl);
                orderDetl.setQty(wrkDetl.getAnfme());
                orderDetl.setOrderId(orderSou.getId());
                orderDetl.setOrderNo(orderSou.getOrderNo());
                orderDetl.setStatus(1);
                orderDetl.setCreateTime(orderSou.getCreateTime());
                orderDetl.setCreateBy(orderSou.getCreateBy());
                orderDetl.setUpdateTime(orderSou.getUpdateTime());
                orderDetl.setUpdateBy(orderSou.getUpdateBy());
                orderDetl.setId(null);
                //先按照批次匹配，再按照无批次号批次，因为销售发货，批次号可能带，有可能不携带，所以就会有问题；而且考虑到一条订单里如果相同物料，一条带批次，一条不带批次，情况
                for (OrderDetl xxx : old) {
                    if (xxx.beSimilar(wrkDetl)) {
                        orderDetl.setRemark(xxx.getRemark());
                    }
                }
                if (Cools.isEmpty(orderDetl.getRemark())) {
                    for (OrderDetl xxx : old) {
                        if (xxx.beSimilarByWrkDetl(wrkDetl)) {
                            orderDetl.setRemark(xxx.getRemark());
                        }
                    }
                }
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
            }

            // 修改订单状态 2.作业中 ===>> 4.待上报
            if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            }
            // 修改订单状态 4.完成 ===>> 6.结束
            OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
        }
        return SUCCESS;
    }


    @Transactional
    public ReturnT<String> startOrderReport(Order order) {