From e932af040450873f240bb89115c13f3a638bcd6c Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Thu, 7 May 2026 16:02:16 +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

---
 .../fullWorkOrder/mapper/FullWorkOrderMapper.java    |  4 ++++
 .../service/impl/FullWorkOrderServiceImpl.java       | 12 ++++++++++--
 .../main/resources/mapper/FullWorkOrderMapper.xml    |  4 ++++
 .../controller/weighManage/ah/AHDZCConnect.java      |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/mapper/FullWorkOrderMapper.java b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/mapper/FullWorkOrderMapper.java
index 680bcce..0ac2a26 100644
--- a/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/mapper/FullWorkOrderMapper.java
+++ b/wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/mapper/FullWorkOrderMapper.java
@@ -10,6 +10,8 @@ import top.continew.starter.data.mp.base.BaseMapper;
 import top.wms.admin.fullWorkOrder.model.entity.FullWorkOrderDO;
 import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp;
 
+import java.util.List;
+
 /**
  * 整箱领取记录 Mapper
  *
@@ -21,4 +23,6 @@ public interface FullWorkOrderMapper extends BaseMapper<FullWorkOrderDO> {
 
     IPage<FullWorkOrderResp> selectFullWorkOrderPage(@Param("page") Page<Object> objectPage,
                                                      @Param(Constants.WRAPPER) QueryWrapper<FullWorkOrderDO> queryWrapper);
+
+    List<FullWorkOrderResp> selectFullWorkOrderExport(@Param(Constants.WRAPPER) QueryWrapper<FullWorkOrderDO> queryWrapper);
 }
\ No newline at end of file
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..b7cadbf 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<FullWorkOrderMappe
 
     @Override
     public void export(FullWorkOrderQuery query, SortQuery sortQuery, HttpServletResponse response) {
-        List<FullWorkOrderResp> list = super.list(query, sortQuery, this.getDetailClass());
-        list.forEach(super::fill);
+        QueryWrapper<FullWorkOrderDO> 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<FullWorkOrderResp> list = baseMapper.selectFullWorkOrderExport(queryWrapper);
+
         ExcelUtils.export(list, "整箱领取导出记录", FullWorkOrderResp.class, response);
     }
 
diff --git a/wms-module-system/src/main/resources/mapper/FullWorkOrderMapper.xml b/wms-module-system/src/main/resources/mapper/FullWorkOrderMapper.xml
index 40e2517..21dcebd 100644
--- a/wms-module-system/src/main/resources/mapper/FullWorkOrderMapper.xml
+++ b/wms-module-system/src/main/resources/mapper/FullWorkOrderMapper.xml
@@ -12,4 +12,8 @@
         left join sys_user u on f.create_user = u.id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="selectFullWorkOrderExport" resultType="top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp">
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
index 8f4e034..090c8f7 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
 public class AHDZCConnect {
 
     //老设备（只能跑jar包的）
-    //    private static final String PORT_NAME = "COM12";
+    private static final String PORT_NAME = "COM12";
     //新设备（环境齐全的）
-    private static final String PORT_NAME = "COM13";
+    //    private static final String PORT_NAME = "COM13";
     private static final int BAUD_RATE = 9600;
     private static final int DATA_BITS = 8;
     private static final int STOP_BITS = 1;