From 60806825951c111ac107dec87bd3acc5a7d6a707 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 三月 2026 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |   99 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index ef786c4..9b1ade3 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -15,21 +15,104 @@
         <result column="product_id" property="productId" />
     </resultMap>
     <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
-        select pm.*,p.product_name
+        select pm.*,p.product_name,p.parent_id,p1.product_name as parent_name,
+        case
+        when p1.product_name is null then 0 -- 鍘熸潗鏂�
+        when p1.product_name is not null and p1.product_name like '%鍗婃垚鍝�%' then 1 -- 鍗婃垚鍝�
+        when p1.product_name is not null and p1.product_name like '%鎴愬搧%' then 2 -- 鎴愬搧
+        else 0 -- 榛樿涓哄師鏉愭枡
+        end as product_type
         from product_model pm
         left join product p on pm.product_id = p.id
+        left join product p1 on p1.id = p.parent_id
         <where>
-            <if test="c.model != null || c.model != ''">
-                and pm.model = like  concat('%',#{c.model},'%')
+            <if test="c.model != null and c.model != ''">
+                and pm.model like concat('%',#{c.model},'%')
             </if>
-            <if test="c.productName != null || c.productName != ''">
-                and p.product_name = like  concat('%',#{c.productName},'%')
-            </if>
-            <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like  concat('%',#{c.speculativeTradingName},'%')
+            <if test="c.productName != null and c.productName != ''">
+                and p.product_name like concat('%',#{c.productName},'%')
             </if>
         </where>
+        order by pm.id
+
+    </select>
+    <select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
+            SELECT * FROM product_model
+            ORDER BY create_time DESC, id DESC
+            LIMIT 1
     </select>
 
+    <select id="listPageProductionStock" resultType="com.ruoyi.basic.pojo.ProductModel">
+        SELECT
+        pm.id,
+        pm.product_id,
+        pm.model,
+        pm.unit,
+        p.product_name,
+        GREATEST(s.last_in_time, o.last_out_time) AS create_time,
+        COALESCE(s.inboundNum, 0) AS inboundNum,
+        COALESCE(o.outboundNum, 0) AS outboundNum,
+        COALESCE(s.inboundNum, 0) - COALESCE(o.outboundNum, 0) AS stockQuantity
+        FROM product_model pm
+        LEFT JOIN product p ON pm.product_id = p.id
+
+        -- 鍏ュ簱姹囨��
+        LEFT JOIN (
+        SELECT
+        product_model_id,
+        SUM(inbound_num) AS inboundNum,
+        MAX(create_time) AS last_in_time
+        FROM procurement_record_storage
+        <where>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                AND create_time &gt;= #{req.timeStr}
+                AND create_time &lt; DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+            </if>
+        </where>
+        GROUP BY product_model_id
+        ) s ON s.product_model_id = pm.id
+
+        -- 鍑哄簱姹囨��
+        LEFT JOIN (
+        SELECT
+        product_model_id,
+        SUM(inbound_num) AS outboundNum,
+        MAX(create_time) AS last_out_time
+        FROM procurement_record_out
+        <where>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                AND create_time &gt;= #{req.timeStr}
+                AND create_time &lt; DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+            </if>
+        </where>
+        GROUP BY product_model_id
+        ) o ON o.product_model_id = pm.id
+
+        <where>
+            <if test="req.timeStr != null and req.timeStr != ''">
+                AND (s.product_model_id IS NOT NULL OR o.product_model_id IS NOT NULL)
+            </if>
+
+            <if test="req.productCategory != null and req.productCategory != ''">
+                AND EXISTS (
+                SELECT 1
+                FROM sales_ledger_product slp
+                WHERE slp.product_id = p.id
+                AND slp.product_category LIKE CONCAT('%', #{req.productCategory}, '%')
+                )
+            </if>
+        </where>
+
+        ORDER BY pm.id DESC
+    </select>
+    <select id="getProductAndModelList" resultType="java.util.Map">
+        select p.id as id,
+               pm.id as modelId,
+               p.product_name as productName ,
+               pm.model as  model
+        from product_model pm
+        left join product p on p.id = pm.product_id
+        order by p.id,pm.id desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3