From c81008c462d2dff5689a942cfb9adaf58b257c56 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:07:50 +0800
Subject: [PATCH] 浪潮对接单点登录:质量检测管理系统

---
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml |   67 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index dd03d4d..e8eaea3 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -141,8 +141,9 @@
         t1.inbound_batches,
         t1.unit_price as unitPrice,
         sum(t1.total_price) as totalPrice,
-        sum(t1.inbound_num) / COALESCE(count(1), 1) as inboundNum,
-        sum(t1.inbound_num) / COALESCE(count(1), 1) as inboundNum0,
+        sum(t1.inbound_num) as inboundNum,
+        sum(t1.inbound_num) as inboundNum0,
+        t1.inbound_num as totalInboundNum,
         t1.create_time,
         t1.update_time,
         t1.create_by,
@@ -264,13 +265,12 @@
         t1.update_time,
         t1.create_by,
         t2.warn_num,
-        (t1.inbound_num - COALESCE(SUM(t4.inbound_num), 0)) / count(1) AS availableStock
+        t2.product_id
         from  procurement_record_storage t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
         left join sales_ledger t3 on t3.id = t2.sales_ledger_id
-        left join procurement_record_out t4 on t4.procurement_record_storage_id = t1.id and t1.type = 2
         <where>
-            t1.type = 2
+            t1.type = 2 and t1.sales_ledger_product_id != 0
             <if test="req.customerName != null and req.customerName != ''">
                 and t3.customer_name like  concat('%',#{req.customerName},'%')
             </if>
@@ -281,10 +281,6 @@
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
         </where>
-        group by t1.id
-        <if test="req.flag != null and req.flag">
-            having availableStock > 0
-        </if>
         order by t1.create_time desc
     </select>
     <select id="listPageCopyByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
@@ -312,13 +308,12 @@
         t1.update_time,
         t1.create_by,
         t2.warn_num,
-        SUM(t1.inbound_num) - COALESCE(SUM(t4.inbound_num), 0) / COALESCE(count(1), 1) AS availableStock
+        t2.product_id
         from  procurement_record_storage t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
         left join sales_ledger t3 on t3.id = t2.sales_ledger_id
-        left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 2
         <where>
-            t4.type = 2 and t1.type = 2
+            t1.type = 2
             <if test="req.customerName != null and req.customerName != ''">
                 and t3.customer_name like  concat('%',#{req.customerName},'%')
             </if>
@@ -327,6 +322,9 @@
             </if>
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
+            </if>
+            <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+                and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
             </if>
             <if test="req.reportDate != null">
                 and t1.create_time >= #{req.reportDate} and t1.create_time &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -345,7 +343,50 @@
             </if>
         </where>
         group by t2.product_category,t2.specification_model,t1.unit_price
-        HAVING availableStock > 0
+        order by t1.create_time desc
+    </select>
+    <select id="listPagePRS" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
+        select *
+        from  procurement_record_storage t1
+        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+          <where>
+              1=1
+              <if test="req.productCategory != null and req.productCategory != ''">
+                  and t2.product_category like  concat('%',#{req.productCategory},'%')
+              </if>
+              <if test="req.timeStr != null and req.timeStr != ''">
+                  and t1.create_time like  concat('%',#{req.timeStr},'%')
+              </if>
+              <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+                  and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
+              </if>
+          </where>
+    </select>
+    <select id="getSumQuantity" resultType="BigDecimal">
+        select COALESCE(sum(inbound_num), 0)
+        from procurement_record_storage
+        where product_model_id = #{productModelId}
+    </select>
+    <select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
+        select
+        t1.*,
+        t1.inbound_num as inboundNum0,
+        t2.model as specification_model  ,
+        t2.unit,
+        t3.product_name as product_category
+        from  procurement_record_storage t1
+        left  join product_model t2 on t1.product_model_id = t2.id
+        left join product t3 on t2.product_id = t3.id
+        <where>
+            t1.type = 2 and t1.sales_ledger_product_id  = 0
+            <if test="req.productCategory != null and req.productCategory != ''">
+                and t3.product_name like  concat('%',#{req.productCategory},'%')
+            </if>
+
+            <if test="req.timeStr != null and req.timeStr != ''">
+                and t1.create_time like  concat('%',#{req.timeStr},'%')
+            </if>
+        </where>
         order by t1.create_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3