From e72867edbe553e5ad9faa86724ba9de1271fd1d0 Mon Sep 17 00:00:00 2001 From: zc Date: Thu, 7 May 2026 16:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=AE=B1=E5=AF=BC=E5=87=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FullWorkOrderServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java index 7c65270..a8283b0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java @@ -71,8 +71,16 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl list = super.list(query, sortQuery, this.getDetailClass()); - list.forEach(super::fill); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StrUtil.isNotBlank(query.getMaterialCode()), "f.material_code", query.getMaterialCode()); + queryWrapper.eq(StrUtil.isNotBlank(query.getOrderNo()), "f.order_no", query.getOrderNo()); + queryWrapper.eq(StrUtil.isNotBlank(query.getBatch()), "f.batch", query.getBatch()); + queryWrapper.eq(StrUtil.isNotBlank(query.getMaterialName()), "m.material_name", query.getMaterialName()); + queryWrapper.between(CollUtil.isNotEmpty(query.getCreateTime()), "f.create_time", CollUtil.getFirst(query + .getCreateTime()), CollUtil.getLast(query.getCreateTime())); + + List list = baseMapper.selectFullWorkOrderExport(queryWrapper); + ExcelUtils.export(list, "整箱领取导出记录", FullWorkOrderResp.class, response); }