From 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 10:45:01 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 93 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index d108498..e9200b9 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -14,4 +14,97 @@
<result column="update_user" property="updateUser" />
</resultMap>
+ <select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
+ select ppm.*,
+ pot.work_order_no as workOrderNo,
+ case pot.status
+ when 1 then '寰呯‘璁�'
+ when 2 then '寰呯敓浜�'
+ when 3 then '鐢熶骇涓�'
+ when 4 then '宸茬敓浜�'
+ else '鏈煡'
+ end as workOrderStatus,
+ su.nick_name as nickName,
+ ifnull(ppo.quantity, 0) as quantity,
+ ifnull(ppo.scrap_qty, 0) as scrapQty,
+ p.product_name as productName,
+ pm.model as productModelName,
+ pm.unit,
+ sl.sales_contract_no as salesContractNo,
+ date(ppm.create_time) as schedulingDate,
+ su.nick_name as schedulingUserName,
+ sl.customer_name as customerName,
+ top2.name as process
+ from production_product_main ppm
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ left join production_order po on pot.production_order_id = po.id
+ left join sales_ledger sl on po.sales_ledger_id = sl.id
+ left join product_model pm on po.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_routing_operation tro on pot.technology_routing_operation_id = tro.id
+ left join technology_operation top2 on tro.technology_operation_id = top2.id
+ left join sys_user su on ppm.create_user = su.user_id
+ left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ <where>
+ <if test="c.productNo != null and c.productNo != ''">
+ and ppm.product_no like concat('%', #{c.productNo}, '%')
+ </if>
+ <if test="c.workOrderNo != null and c.workOrderNo != ''">
+ and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
+ </if>
+ <if test="c.salesContractNo != null and c.salesContractNo != ''">
+ and sl.sales_contract_no like concat('%', #{c.salesContractNo}, '%')
+ </if>
+ <if test="c.customerName != null and c.customerName != ''">
+ and sl.customer_name like concat('%', #{c.customerName}, '%')
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.productModelName != null and c.productModelName != ''">
+ and pm.model like concat('%', #{c.productModelName}, '%')
+ </if>
+ <if test="c.process != null and c.process != ''">
+ and top2.name like concat('%', #{c.process}, '%')
+ </if>
+ <if test="c.schedulingDate != null">
+ and date(ppm.create_time) = #{c.schedulingDate}
+ </if>
+ </where>
+ order by ppm.create_time desc
+ </select>
+
+ <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductionOrder">
+ select null
+ </select>
+
+ <select id="listProductionDetails" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
+ select ppm.*,
+ pot.work_order_no as workOrderNo,
+ p.product_name as productName,
+ pm.model as productModelName,
+ pm.unit,
+ top2.name as process,
+ ifnull(ppo.quantity, 0) as quantity,
+ ifnull(ppo.scrap_qty, 0) as scrapQty
+ from production_product_main ppm
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ left join production_order po on pot.production_order_id = po.id
+ left join product_model pm on po.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_routing_operation tro on pot.technology_routing_operation_id = tro.id
+ left join technology_operation top2 on tro.technology_operation_id = top2.id
+ left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ order by ppm.create_time desc
+ </select>
+
+ <select id="listMain" resultType="java.lang.Long">
+ select id
+ from production_product_main
+ where production_operation_task_id in
+ <foreach collection="list" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
+
</mapper>
--
Gitblit v1.9.3