1

zhangc

2025-04-11 7bb188f8b47524eac7dde3626f3d9d8e959ae753

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

@@ -84,7 +84,7 @@
    @RequestMapping(value = "/locDetl/list/auth/v2")
    @ManagerAuth
    public R listV2(@RequestParam(defaultValue = "1") Integer curr,
                    @RequestParam(defaultValue = "10") Integer limit,
                    @RequestParam(defaultValue = "100") Integer limit,
                    @RequestParam(required = false) String orderByField,
                    @RequestParam(required = false) String orderByType,
                    @RequestParam(required = false) String condition,
@@ -119,7 +119,7 @@
            wrapper.and()
                    .where("loc_no like '" + row + "%'");
        }
        Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), wrapper);
        Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, 500), wrapper);
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.get("loc_no")));
        String orderNo = null;
        if (agvWrkMast != null) {
@@ -137,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 {
@@ -157,9 +170,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());