1

zhangc

2025-04-17 bdfe4b740175f29858c870d710ec6ff5d4dc6ef0

1

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

@@ -132,11 +132,17 @@
        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
        boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist2 = true;
        try {
            agvWrkDetlExist2 = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no", orderNo.replace("DC", ""))) < 1;
        } catch (Exception e) {

        }

        ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);

        boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist && agvWrkDetlExist2) {
            if (pltType == null) {
                if (!this.updateSettle(order.getId(), 6L, 9528L)) {
                    throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
@@ -152,6 +158,8 @@
            }
        }
    }



    @Override
    @Transactional
@@ -179,11 +187,17 @@
        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
        boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist2 = true;
        try {
            agvWrkDetlExist2 = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no", orderNo.replace("DC", ""))) < 1;
        } catch (Exception e) {

        }

        ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);

        boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist && agvWrkDetlExist2) {
            if (!this.updateSettle(order.getId(), 6L, 9528L)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }

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

@@ -82,8 +82,7 @@
                    Boolean flag = false;
                    for (OrderDetl orderDetl : orderDetlList) {
                        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
                        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", order.getOrderNo())) < 1;
                        if (!Cools.isEmpty(agvLocDetls) && agvWrkDetlExist) {
                        if (!Cools.isEmpty(agvLocDetls) ) {
                            //只要有一项订单明细存在，则标识为true，跳过该订单
                            flag = true;
                        }