兼容四期

zhangc

2025-02-18 941bf6ff9bb24315dce4b9e39fb370b9fa766842

 src/main/java/com/zy/asrs/controller/AgvLocDetlController.java

@@ -137,19 +137,22 @@
            }
        }
        for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
            OrderDetl orderDetl;
            if (!Cools.isEmpty(orderNo)) {
                orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                        .eq("order_no", orderNo)
                        .eq("three_code", record.getThreeCode())
                        .eq("matnr", record.getMatnr())
                        .in("source", docIds));
            } else {
                orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                        .eq("three_code", record.getThreeCode())
                        .eq("matnr", record.getMatnr())
                        .in("source", docIds));
            }
            //OrderDetl orderDetl;
//            if (!Cools.isEmpty(orderNo)) {
//                orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
//                        .eq("order_no", orderNo)
//                        .eq("three_code", record.getThreeCode())
//                        .eq("matnr", record.getMatnr())
//                        .in("source", docIds));
//            } else {
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                    .eq("three_code", record.getThreeCode())
                    .eq("matnr", record.getMatnr())
                    .in("source", docIds)
                    .orderBy("qty", false)
                    .orderBy("anfme", false)
                    .orderBy("create_time", true));
            //   }
//            if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
//                record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
//            } else {
@@ -157,9 +160,9 @@
//            }
            if (Cools.isEmpty(orderDetl)) {
                record.setStock(0D);
                if (!Cools.isEmpty(orderNo)) {
                    record.setOrderNo(orderNo);
                }
//                if (!Cools.isEmpty(orderNo)) {
//                    record.setOrderNo(orderNo);
//                }
            } else {
                record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
                record.setOrderNo(orderDetl.getOrderNo());