From 141248aebc2733d08e3c7bbe2753fb7984bb1893 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Mon, 16 Jun 2025 15:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/purchase/PurchaseBindMapper.xml  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
index 7e264ece..f48a3545 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
@@ -223,13 +223,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt.type_name AS materialModel,
             pcd.check_num AS purchaseNum,
             pcd.check_num AS checkNum,
-            pcd.bind_num AS bindNum,
+            ifnull(pcd.bind_num,0) AS bindNum,
             pcd.type_id as typeId,
             mt.unit_name AS unitName,
             ms.supplier AS supplierName,
             pcd.production_time AS productDate,
             mt.manage_type AS manageType,
-            pcd.`status` AS STATUS,
+            pcd.`status` ,
             pm.ma_code AS maCode,
             pm.out_fac_code AS outFacCode,
             pm.qr_code AS qrCode
@@ -242,15 +242,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_supplier_info ms ON pcd.supplier_id = ms.supplier_id
                 LEFT JOIN bm_qrcode_info pm on pcd.task_id = pm.task_id and pm.type_id = pcd.type_id
         where 1 = 1
-        <if test="typeId != null and typeId != ''">
+        <if test="typeId != null ">
             AND mt.type_id = #{typeId}
         </if>
-        <if test="supplierId != null and supplierId != ''">
+        <if test="supplierId != null ">
             AND ms.supplier_id = #{supplierId}
         </if>
-        <if test="productDate != null and productDate != ''">
-            <![CDATA[ AND DATE_FORMAT( pcd.production_time, '%Y-%m-%d' ) = #{productDate} ]]>
-        </if>
+
         <if test="taskId != null">
             AND pcd.task_id = #{taskId}
         </if>