From 9a6a9d7baab7d84e396be2afa57c674e775341f1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 31 三月 2026 12:25:57 +0800
Subject: [PATCH] fix: 库存管理区分手动新增与供应商名称

---
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml |   48 +++++++++++++++++-------------------------------
 1 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 1d99122..0d9e290 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -106,11 +106,11 @@
 
     <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
-        t3.supplier_name,
+        IFNULL(t3.supplier_name, '鎵嬪姩鏂板') as supplierName,
         t3.purchase_contract_number,
         case when t2.product_category is null then t5.product_name
         else t2.product_category end as productCategory,
-        max(t1.id) as id,
+        t1.id,
         t1.sales_ledger_product_id,
         t1.create_user,
         case when t2.specification_model is null then t4.model
@@ -122,12 +122,12 @@
         t2.tax_inclusive_unit_price,
         t2.tax_inclusive_total_price,
         t2.tax_exclusive_total_price,
-        group_concat(t1.inbound_batches) as inbound_batches,
+        t1.inbound_batches,
         sum(t1.inbound_num) as inboundNum,
         sum(t1.inbound_num) as inboundNum0,
-        sum(t1.inbound_num) as totalInboundNum,
-        max(t1.create_time) as create_time,
-        max(t1.update_time) as update_time,
+        t1.inbound_num as totalInboundNum,
+        t1.create_time,
+        t1.update_time,
         t1.create_by,
         t2.warn_num
         from procurement_record_storage t1
@@ -138,34 +138,20 @@
         <where>
             1 = 1
             <if test="req.supplierName != null and req.supplierName != ''">
-                and t3.supplier_name like concat('%',#{req.supplierName},'%')
-            </if>
-            <if test="req.timeStr != null and req.timeStr != ''">
-                and t1.create_time like concat('%',#{req.timeStr},'%')
-            </if>
-            <if test="req.reportDate != null">
-                and t1.create_time >= #{req.reportDate} and t1.create_time &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1
-                DAY)
-            </if>
-            <if test="req.startMonth != null">
-                and t1.create_time >= #{req.startMonth}
-            </if>
-            <if test="req.endMonth != null">
-                and t1.create_time &lt;= #{req.endMonth}
-            </if>
-            <if test="req.startDate != null">
-                and t1.create_time >= #{req.startDate}
-            </if>
-            <if test="req.endDate != null">
-                and t1.create_time &lt;= #{req.endDate}
+                and (t3.supplier_name like concat('%',#{req.supplierName},'%')
+                or (#{req.supplierName} = '鎵嬪姩鏂板' and t3.supplier_name is null))
             </if>
         </where>
         group by
-            t3.supplier_name,
-            t3.purchase_contract_number,
-            productCategory,
-            specificationModel,
-            unit
+        IFNULL(t3.supplier_name, '鎵嬪姩鏂板'),
+        productCategory,
+        specificationModel,
+        t1.product_model_id,
+        t2.id
+        order by
+        (t3.supplier_name IS NULL) DESC,
+        t3.supplier_name ASC,
+        productCategory ASC
     </select>
 
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">

--
Gitblit v1.9.3