1.減料途中幷板完善 2.訂單出庫作業優化

cp

2025-07-08 2712cf6566bc3304bda8b32d84875096fa0a64d0

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

@@ -489,14 +489,25 @@
        }

        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Order::getStatus, 1);
        wrapper.in(Order::getStatus, 1,2);
        wrapper.eq(Order::getHostId, getHostId());
        wrapper.in(Order::getDocType, typeList);
        List<Order> orders = orderService.list(wrapper);

        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);
        }