From a3c54410de03f0fd242e1a1118d6471300cf1eda Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 四月 2026 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionOrderMapper.xml | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index b2f895d..2ea7d33 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -5,7 +5,6 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionOrder">
<id column="id" property="id" />
- <result column="sales_ledger_id" property="salesLedgerId" />
<result column="production_plan_ids" property="productionPlanIds" />
<result column="product_model_id" property="productModelId" />
<result column="nps_no" property="npsNo" />
@@ -16,7 +15,6 @@
<result column="complete_quantity" property="completeQuantity" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
- <result column="sale_ledger_product_id" property="saleLedgerProductId" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
<result column="plan_complete_time" property="planCompleteTime" />
@@ -33,7 +31,6 @@
<sql id="ProductionOrderVoColumns">
po.id,
- po.sales_ledger_id,
po.production_plan_ids,
po.product_model_id,
po.nps_no,
@@ -44,24 +41,38 @@
po.complete_quantity,
po.start_time,
po.end_time,
- po.sale_ledger_product_id,
po.create_user,
po.dept_id,
po.plan_complete_time,
po.status,
- sl.sales_contract_no as salesContractNo,
- sl.customer_name as customerName,
+ po_sales.salesContractNo,
+ po_sales.customerName,
p.product_name as productName,
pm.model as model,
- tr.process_route_code as processRouteCode
+ po.is_end_order as endOrder,
+ tr.process_route_code as processRouteCode,
+ ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
+ tb.bom_no as bomNo
</sql>
<sql id="ProductionOrderVoFrom">
from production_order po
- left join sales_ledger sl on po.sales_ledger_id = sl.id
+ left join (
+ select po2.id as orderId,
+ group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
+ group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName,
+ group_concat(distinct sl2.project_name order by sl2.project_name separator ',') as projectName,
+ min(sl2.delivery_date) as deliveryDate
+ from production_order po2
+ left join production_plan pp2
+ on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
+ group by po2.id
+ ) po_sales on po_sales.orderId = 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 tr on po.technology_routing_id = tr.id
+ left join technology_bom tb on tb.id = tr.bom_id
</sql>
<sql id="ProductionOrderWhere">
@@ -70,17 +81,17 @@
<if test="c.id != null">
and po.id = #{c.id}
</if>
- <if test="c.salesLedgerId != null">
- and po.sales_ledger_id = #{c.salesLedgerId}
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
</if>
<if test="c.productModelId != null">
and po.product_model_id = #{c.productModelId}
</if>
<if test="c.technologyRoutingId != null">
and po.technology_routing_id = #{c.technologyRoutingId}
- </if>
- <if test="c.saleLedgerProductId != null">
- and po.sale_ledger_product_id = #{c.saleLedgerProductId}
</if>
<if test="c.status != null">
and po.status = #{c.status}
@@ -136,9 +147,9 @@
<select id="selectProgressOrders" resultType="com.ruoyi.home.dto.ProductionProgressOrderDto">
select po.nps_no,
- sl.sales_contract_no,
- sl.project_name,
- sl.customer_name,
+ po_sales.salesContractNo,
+ po_sales.projectName,
+ po_sales.customerName,
p.product_name as productCategory,
pm.model as specificationModel,
tr.process_route_code as processRouteCode,
@@ -146,11 +157,22 @@
ifnull(po.complete_quantity, 0) as completeQuantity,
round(ifnull(po.complete_quantity, 0) / nullif(po.quantity, 0) * 100, 2) as completionStatus,
tb.bom_no,
- datediff(sl.delivery_date, curdate()) as deliveryDaysDiff,
- sl.delivery_date,
+ datediff(po_sales.deliveryDate, curdate()) as deliveryDaysDiff,
+ po_sales.deliveryDate as deliveryDate,
false as isFh
from production_order po
- left join sales_ledger sl on po.sales_ledger_id = sl.id
+ left join (
+ select po2.id as orderId,
+ group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
+ group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName,
+ group_concat(distinct sl2.project_name order by sl2.project_name separator ',') as projectName,
+ min(sl2.delivery_date) as deliveryDate
+ from production_order po2
+ left join production_plan pp2
+ on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
+ group by po2.id
+ ) po_sales on po_sales.orderId = 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 tr on po.technology_routing_id = tr.id
--
Gitblit v1.9.3