四期

zhangc

2025-03-09 dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3

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

@@ -123,7 +123,8 @@
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.get("loc_no")));
        String orderNo = null;
        if (agvWrkMast != null) {
            List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
            //List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
            List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
            if (!agvWrkDetls.isEmpty()) {
                orderNo = agvWrkDetls.get(0).getOrderNo();
            }
@@ -136,19 +137,32 @@
            }
        }
        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 {
            List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                    .eq("three_code", record.getThreeCode())
                    .eq("matnr", record.getMatnr())
                    .in("source", docIds)
                    .orderBy("qty", true)
                    .orderBy("anfme", false)
                    .orderBy("create_time", true));
            OrderDetl orderDetl = null;
            if (!orderDetls.isEmpty()) {
                for (OrderDetl o : orderDetls) {
                    if (o.getAnfme() - o.getQty() > 0) {
                        orderDetl = o;
                        break;
                    }
                }
            }

            //   }
//            if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
//                record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
//            } else {
@@ -156,6 +170,9 @@
//            }
            if (Cools.isEmpty(orderDetl)) {
                record.setStock(0D);
//                if (!Cools.isEmpty(orderNo)) {
//                    record.setOrderNo(orderNo);
//                }
            } else {
                record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
                record.setOrderNo(orderDetl.getOrderNo());