From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口,销售台账查询其产品的状态 2.增添不合格现象字段,取消生产状态字段 3.修改发货审批接口,发货审批通过,生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入,产出2:1调整

---
 src/main/resources/mapper/basic/SupplierManageMapper.xml |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 248b940..ba7fac3 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -21,12 +21,49 @@
         T1.create_user,
         T1.update_time,
         T1.update_user,
-        T1.tenant_id
+        T1.tenant_id,
+        T1.is_white,
+        T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>
             <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
-                AND supplier_name = #{supplierManageDto.supplierName}
+                AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
+            </if>
+            <if test="supplierManageDto.isWhite != null">
+                AND T1.is_white = #{supplierManageDto.isWhite}
+            </if>
+        </where>
+    </select>
+
+    <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
+        SELECT
+        T1.id,
+        T1.supplier_name,
+        T1.taxpayer_identification_num,
+        T1.company_address,
+        T1.company_phone,
+        T1.bank_account_name,
+        T1.bank_account_num,
+        T1.contact_user_name,
+        T1.contact_user_phone,
+        T1.maintain_user_id,
+        T1.maintain_time,
+        T1.create_time,
+        T1.create_user,
+        T1.update_time,
+        T1.update_user,
+        T1.tenant_id,
+        T1.is_white,
+        T2.nick_name AS maintainUserName
+        FROM supplier_manage T1
+        LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
+        <where>
+            <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
+                AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
+            </if>
+            <if test="supplierManageDto.isWhite != null">
+                AND T1.is_white = #{supplierManageDto.isWhite}
             </if>
         </where>
     </select>

--
Gitblit v1.9.3