From 3bd356cdf09bc2e67dfe0ce9e6dc1b4dfe0e1bec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 13:16:14 +0800
Subject: [PATCH] feat(production): 新增入库添加产品规格型号id，销售台账添加产品校验库存是否充足

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

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 26f13a8..08faec0 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -4,21 +4,23 @@
 
     <select id="listProcurementBySalesLedgerId" resultType="com.ruoyi.procurementrecord.dto.ProcurementDto">
         select
-            t1.supplier_name,
-            t2.product_category,
-            t2.id,
-            t3.id as recordId,
-            t2.specification_model,
-            t2.unit,
-            t2.quantity,
-            t2.min_stock,
-            t2.quantity as quantity0,
-            t2.tax_rate,
-            t2.tax_inclusive_unit_price,
-            t2.tax_inclusive_total_price,
-            t2.tax_exclusive_total_price,
-            t3.inbound_num as quantityStock
-        from  purchase_ledger t1
+        t1.supplier_name,
+        t2.product_category,
+        t2.id,
+        t3.id as recordId,
+        t2.specification_model,
+        t2.unit,
+        t2.quantity,
+        t2.min_stock,
+        t2.warn_num,
+        t2.quantity as quantity0,
+        t2.tax_rate,
+        t2.tax_inclusive_unit_price,
+        t2.tax_inclusive_total_price,
+        t2.tax_exclusive_total_price,
+        t3.inbound_num as quantityStock,
+        t2.product_model_id
+        from purchase_ledger t1
         left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
         left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
         where t1.purchase_contract_number = #{req.purchaseContractNumber}
@@ -39,21 +41,25 @@
         t2.unit,
         t2.tax_rate,
         t2.tax_inclusive_unit_price,
-        t2.tax_inclusive_total_price,
-        t2.tax_exclusive_total_price,
+        (t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
+        (t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate / 100) as taxExclusiveTotalPrice,
         t1.inbound_batches,
         t1.inbound_num,
         t1.inbound_num as inboundNum0,
         t1.create_time,
         t1.update_time,
-        t1.create_by
+        t1.create_by,
+        t2.warn_num
         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
         <where>
             1 = 1
             <if test="req.supplierName != null and req.supplierName != ''">
-                and t3.supplier_name like  concat('%',#{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>
         </where>
     </select>
@@ -96,12 +102,13 @@
         t2.tax_inclusive_total_price,
         t2.tax_exclusive_total_price,
         t1.inbound_batches,
-        t1.inbound_num,
-        t1.inbound_num 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
+        t1.create_by,
+        t2.warn_num
         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
@@ -109,6 +116,9 @@
             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)
@@ -126,6 +136,7 @@
                 and t1.create_time &lt;= #{req.endDate}
             </if>
         </where>
+        group by t3.supplier_name,t2.product_category,t2.specification_model
     </select>
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
@@ -153,4 +164,9 @@
                   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
     </select>
+    <select id="getSumQuantity" resultType="BigDecimal">
+        select COALESCE(sum(inbound_num), 0)
+        from procurement_record_storage
+        where product_model_id = #{productModelId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3