From ad33168e9cdb8542cee2a50e4b3654bed7cab4ba Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sat, 5 Jul 2025 22:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/material/ma/domain/Machine.java    | 4 ++--
 .../mapper/material/codeCollection/WsMaInfoMapper.xml      | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
index e196e35e..c34e6361 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
@@ -70,8 +70,8 @@ public class Machine extends BaseEntity
     /** 出厂日期 */
     @ApiModelProperty(value = "出厂日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date outFacTime;
+    @Excel(name = "出厂日期")
+    private String outFacTime;
 
     /** 出厂编号 */
     @Excel(name = "出厂编号")
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
index c77c707e..c2fad0d8 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
@@ -78,8 +78,11 @@
         SELECT *
         FROM ws_ma_info
         <where>
-            <if test="maCode != null">
-                ma_code like concat('%', #{maCode}, '%')
+            <if test="maCode != null and maCode != ''">
+                and ma_code like concat('%', #{maCode}, '%')
+            </if>
+            <if test="qrCode != null and qrCode != ''">
+                and qr_code = #{qrCode}
             </if>
         </where>
     </select>