From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 139 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 130 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index aeb4230..8d2a066 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -12,25 +12,73 @@
<result property="status" column="status"/>
</resultMap>
+<!-- <select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.dto.ProductionProductMainDto">-->
+<!-- select ppm.*,-->
+<!-- pwo.work_order_no as workOrderNo,-->
+<!-- pwo.status as workOrderStatus,-->
+<!-- u.nick_name as nickName,-->
+<!-- p.product_name as productName,-->
+<!-- pp.name as process,-->
+<!-- pm.model as productModelName,-->
+<!-- ppo.quantity,-->
+<!-- ppo.scrap_qty,-->
+<!-- pm.unit,-->
+<!-- sl.sales_contract_no salesContractNo-->
+<!-- from-->
+<!-- production_product_main ppm-->
+<!-- left join product_work_order pwo on pwo.id = ppm.work_order_id-->
+<!-- left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id-->
+<!-- left join product_process pp on pp.id = ppri.process_id-->
+<!-- left join product_order po on po.id = pwo.product_order_id-->
+<!-- left join production_product_output ppo on ppm.id = ppo.product_main_id-->
+<!-- left join product_model pm on pm.id = ppo.product_model_id-->
+<!-- left join product p on p.id = pm.product_id-->
+<!-- left join sales_ledger sl on sl.id = po.sales_ledger_id-->
+<!-- left join sys_user u on u.user_id = ppm.user_id-->
+<!-- <where>-->
+<!-- <if test="c.nickName != null and c.nickName != ''">-->
+<!-- and u.nick_name like concat('%',#{c.nickName},'%')-->
+<!-- </if>-->
+<!-- <if test="c.workOrderNo != null and c.workOrderNo != ''">-->
+<!-- and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')-->
+<!-- </if>-->
+<!-- <if test="c.workOrderStatus != null and c.workOrderStatus != ''">-->
+<!-- and pwo.status = #{c.workOrderStatus}-->
+<!-- </if>-->
+<!-- <if test="c.status != null and c.status != ''">-->
+<!-- and ppm.status = #{c.status}-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- order by ppm.id-->
+<!-- </select>-->
+
+ <!-- 鏂皊ql 鐢ㄤ腑闂磋〃sales_ledger_production_ref杩涜鍏宠仈sales_ledger鍜宲roduct_order锛屾煡璇㈠嚭鎵�鏈夊叧鑱旂殑sales_ledger_no-->
<select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
select ppm.*,
pwo.work_order_no as workOrderNo,
pwo.status as workOrderStatus,
u.nick_name as nickName,
p.product_name as productName,
+ pp.name as process,
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
pm.unit,
- sl.sales_contract_no salesContractNo
+ (
+ SELECT GROUP_CONCAT(DISTINCT sl.sales_contract_no SEPARATOR ',')
+ FROM sales_ledger sl
+ INNER JOIN sales_ledger_production_ref ref ON sl.id = ref.sales_ledger_id
+ WHERE ref.product_order_id = po.id
+ ) AS salesContractNo
from
production_product_main ppm
left join product_work_order pwo on pwo.id = ppm.work_order_id
+ left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id
+ left join product_process pp on pp.id = ppri.process_id
left join product_order po on po.id = pwo.product_order_id
left join production_product_output ppo on ppm.id = ppo.product_main_id
left join product_model pm on pm.id = ppo.product_model_id
left join product p on p.id = pm.product_id
- left join sales_ledger sl on sl.id = po.sales_ledger_id
left join sys_user u on u.user_id = ppm.user_id
<where>
<if test="c.nickName != null and c.nickName != ''">
@@ -47,8 +95,8 @@
</if>
</where>
order by ppm.id
-
</select>
+
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
select po.*
from product_order po
@@ -56,33 +104,106 @@
left join production_product_main pm on work_order_id = pwo.id
where pm.id = #{productMainId}
</select>
+
+<!-- <select id="listProductionDetails" resultType="com.ruoyi.production.dto.ProductionProductMainDto">-->
+<!-- SELECT-->
+<!-- slpa.scheduling_date,-->
+<!-- slpa.scheduling_user_name,-->
+<!-- sl.sales_contract_no,-->
+<!-- sl.customer_name,-->
+<!-- p.product_name,-->
+<!-- pm.model as product_model_name,-->
+<!-- pm.unit,-->
+<!-- slpa.process,-->
+<!-- slpa.finished_num as quantity,-->
+<!-- slpa.work_hours,-->
+<!-- slpa.work_hours * slpa.finished_num AS wages-->
+<!-- FROM-->
+<!-- production_product_main ppm-->
+<!-- LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id-->
+<!-- LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id-->
+<!-- LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id-->
+<!-- LEFT JOIN product_order po ON po.id = pwo.product_order_id-->
+<!-- LEFT JOIN process_route pr ON pr.id = po.route_id-->
+<!-- LEFT JOIN product_model pm ON po.product_model_id = pm.id-->
+<!-- LEFT JOIN product p ON p.id = pm.product_id-->
+<!-- LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id-->
+<!-- <where>-->
+<!-- <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">-->
+<!-- and slpa.scheduling_user_name = #{ew.schedulingUserName}-->
+<!-- </if>-->
+<!-- <if test="ew.entryDate != null " >-->
+<!-- and slpa.scheduling_date >= #{ew.entryDate}-->
+<!-- and slpa.scheduling_date < DATE_ADD(#{ew.entryDate}, INTERVAL 1 DAY)-->
+<!-- </if>-->
+<!-- <if test="ew.entryDateStart != null and ew.entryDateEnd != null" >-->
+<!-- and slpa.scheduling_date >= #{ew.entryDateStart}-->
+<!-- and slpa.scheduling_date < date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- order by ppm.id desc-->
+<!-- </select>-->
+
+ <!-- 鏂皊ql 鐢ㄤ腑闂磋〃sales_ledger_production_ref杩涜鍏宠仈sales_ledger鍜宲roduct_order锛屾煡璇㈠嚭鎵�鏈夊叧鑱旂殑sales_ledger_no鍜宑ustomer_name-->
<select id="listProductionDetails" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
SELECT
slpa.scheduling_date,
slpa.scheduling_user_name,
- sl.sales_contract_no,
- sl.customer_name,
+
+ (SELECT GROUP_CONCAT(DISTINCT sl_inner.sales_contract_no SEPARATOR ',')
+ FROM sales_ledger sl_inner
+ INNER JOIN sales_ledger_production_ref ref ON sl_inner.id = ref.sales_ledger_id
+ WHERE ref.product_order_id = po.id) AS sales_contract_no,
+ (SELECT GROUP_CONCAT(DISTINCT sl_inner.customer_name SEPARATOR ',')
+ FROM sales_ledger sl_inner
+ INNER JOIN sales_ledger_production_ref ref ON sl_inner.id = ref.sales_ledger_id
+ WHERE ref.product_order_id = po.id) AS customer_name,
+
p.product_name,
- pm.model,
+ pm.model as product_model_name,
pm.unit,
slpa.process,
- ppo.quantity,
+ slpa.finished_num as quantity,
slpa.work_hours,
slpa.work_hours * slpa.finished_num AS wages
FROM
production_product_main ppm
- LEFT JOIN sales_ledger_production_accounting slpa ON slpa.sales_ledger_work_id = ppm.id
+ LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id
LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id
LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
LEFT JOIN product_order po ON po.id = pwo.product_order_id
LEFT JOIN process_route pr ON pr.id = po.route_id
LEFT JOIN product_model pm ON po.product_model_id = pm.id
LEFT JOIN product p ON p.id = pm.product_id
- LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
+
<where>
<if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
and slpa.scheduling_user_name = #{ew.schedulingUserName}
</if>
+ <if test="ew.entryDate != null " >
+ and slpa.scheduling_date >= #{ew.entryDate}
+ and slpa.scheduling_date < DATE_ADD(#{ew.entryDate}, INTERVAL 1 DAY)
+ </if>
+ <if test="ew.entryDateStart != null and ew.entryDateEnd != null" >
+ and slpa.scheduling_date >= #{ew.entryDateStart}
+ and slpa.scheduling_date < date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)
+ </if>
+ </where>
+ order by ppm.id desc
+ </select>
+
+ <select id="listMain" resultType="java.lang.Long">
+ SELECT ppm.id FROM production_product_main ppm
+ left join product_work_order pwo on pwo.id = ppm.work_order_id
+ left join product_order po on po.id = pwo.product_order_id
+ left join sales_ledger sl on sl.id = po.sales_ledger_id
+ <where>
+ <if test="idList != null and idList.size() > 0">
+ and sl.id in
+ <foreach item="id" collection="idList" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
</where>
</select>
--
Gitblit v1.9.3