1

ZY

2024-09-26 ddb9678030a8391fe63e6eb0775a77d12f1023ca

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

@@ -57,6 +57,9 @@
            if (Cools.isEmpty(manPakOut.getStatus()) || manPakOut.getStatus() != 1) {
                return false;
            }
            if(plaQty.getReturned() > 0){
                return false;
            }

            return true;
        }).collect(Collectors.toList());
@@ -74,11 +77,12 @@
    @RequestMapping(value = "/orderNoQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<PlaQty> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("order_no");
        wrapper.like("id", condition);
        wrapper.groupBy("order_no");
        List<String> list = plaQtyService.selectOrderNo();
//        EntityWrapper<PlaQty> wrapper = new EntityWrapper<>();
//        wrapper.setSqlSelect("order_no");
//        wrapper.like("order_no", Cools.isEmpty(condition) ? "0" : condition);
//        wrapper.groupBy("order_no");
//        Page<PlaQty> plaQtyPage = plaQtyService.selectPage(new Page<>(1, 20), wrapper);
        List<String> list = plaQtyService.selectOrderNo(Cools.isEmpty(condition) ? "0" : condition);
        List<Map<String, Object>> result = new ArrayList<>();
        for (String orderNo : list){
            Map<String, Object> map = new HashMap<>();
@@ -86,6 +90,7 @@
            map.put("id", plaQty.getId());
            map.put("value", orderNo);
            map.put("customer", plaQty.getCustomer());
            map.put("type","returned");
            result.add(map);
        }
        return R.ok(result);
@@ -99,7 +104,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                wrapper.eq(entry.getKey(), val);
            }
        }
    }