From c1d251d8c74a9c86e437015d2f1726b120d90fdb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:45:48 +0800
Subject: [PATCH] 发货记录增加数量+“库存预警”字段移至库存管理+点击销售合同号自动跳转到销售台账

---
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 0d9e290..e8e28a8 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -54,7 +54,7 @@
         t1.create_time as createTime,
         t1.update_time as updateTime,
         t1.create_by as createBy,
-        t2.warn_num as warnNum,
+        ifnull(t1.warn_num, t2.warn_num) as warnNum,
         t1.out_stock_quantity as outStockQuantity,
         t1.shortage_description as shortageDescription
         from procurement_record_storage t1
@@ -70,12 +70,15 @@
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like concat('%',#{req.timeStr},'%')
             </if>
+            <if test="req.productModelId != null">
+                and t1.product_model_id = #{req.productModelId}
+            </if>
         </where>
     </select>
 
     <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
-        select t3.supplier_name as supplierName,
-               t3.purchase_contract_number as purchaseContractNumber,
+        select t3.supplier_name                    as supplierName,
+               t3.purchase_contract_number         as purchaseContractNumber,
                case
                    when t2.product_category is null then t5.product_name
                    else t2.product_category end    as productCategory,
@@ -106,11 +109,11 @@
 
     <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
-        IFNULL(t3.supplier_name, '鎵嬪姩鏂板') as supplierName,
+        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,
-        t1.id,
+        max(t1.id) as id,
         t1.sales_ledger_product_id,
         t1.create_user,
         case when t2.specification_model is null then t4.model
@@ -122,15 +125,15 @@
         t2.tax_inclusive_unit_price,
         t2.tax_inclusive_total_price,
         t2.tax_exclusive_total_price,
-        t1.inbound_batches,
+        group_concat(t1.inbound_batches) as inbound_batches,
         sum(t1.inbound_num) as inboundNum,
         sum(t1.inbound_num) as inboundNum0,
-        t1.inbound_num as totalInboundNum,
-        t1.create_time,
-        t1.update_time,
+        sum(t1.inbound_num) as totalInboundNum,
+        max(t1.create_time) as create_time,
+        max(t1.update_time) as update_time,
         t1.create_by,
-        t2.warn_num
-        from procurement_record_storage t1
+        ifnull(t1.warn_num, t2.warn_num) as warnNum
+        from  procurement_record_storage t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
         left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
         left join product_model t4 on t4.id = t1.product_model_id
@@ -138,20 +141,37 @@
         <where>
             1 = 1
             <if test="req.supplierName != null and req.supplierName != ''">
-                and (t3.supplier_name like concat('%',#{req.supplierName},'%')
-                or (#{req.supplierName} = '鎵嬪姩鏂板' and t3.supplier_name is null))
+                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}
             </if>
         </where>
         group by
-        IFNULL(t3.supplier_name, '鎵嬪姩鏂板'),
+        t3.supplier_name,
+        t3.purchase_contract_number,
         productCategory,
         specificationModel,
-        t1.product_model_id,
-        t2.id
+        unit
         order by
         (t3.supplier_name IS NULL) DESC,
-        t3.supplier_name ASC,
-        productCategory ASC
+        t3.supplier_name ASC
     </select>
 
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">

--
Gitblit v1.9.3