#

cp

2025-06-19 e64b1d5ec0b3ca0c42048903f4ab5f9d588349e8

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java

@@ -496,7 +496,18 @@

        ArrayList<Long> orderIds = new ArrayList<>();
        for (Order order : orders) {
            orderIds.add(order.getId());
            Date currentDate = new Date();

            Calendar calendar = Calendar.getInstance();
            calendar.setTime(currentDate);
            calendar.add(Calendar.MONTH, -1);

            Date previousMonthDate = calendar.getTime();
            int result=previousMonthDate.compareTo(order.getCreateTime());
            if(result<0){
                orderIds.add(order.getId());
            }

        }

        //搜索明细
@@ -505,6 +516,7 @@
        wrapper1.eq(OrderDetl::getHostId, getHostId());
        wrapper1.in(OrderDetl::getOrderId, orderIds);
        wrapper1.orderByDesc(OrderDetl::getCreateTime);
//        wrapper1.last("LIMIT 1000");
        if (!Cools.isEmpty(matnr)) {
            wrapper1.like(OrderDetl::getMatnr, matnr);
        }
@@ -523,6 +535,7 @@

            PickMatParam matParam = new PickMatParam();
            matParam.setMatnr(orderDetl.getMatnr());
            matParam.setMaktx(orderDetl.getMaktx());
            matParam.setBatch(orderDetl.getBatch());
            matParam.setOrderNo(orderDetl.getOrderNo());
            matParam.setOrderId(orderDetl.getOrderId());