From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +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/ProductOrderMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index ff4b68f..452758e 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.production.mapper.ProductOrderMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductOrder">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProductOrder">
<id property="id" column="id"/>
<result property="productModelId" column="product_model_id"/>
<result property="tenantId" column="tenant_id"/>
@@ -13,12 +13,13 @@
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
+ <select id="pageProductOrder" resultType="com.ruoyi.production2.dto.ProductOrderDto">
select po.*,
sl.sales_contract_no,
sl.customer_name,
- slp.product_category,
- slp.specification_model,
+ p.product_name as product_category,
+ pm.model as specification_model,
+ pm.unit,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
@@ -38,7 +39,9 @@
FROM shipping_info
GROUP BY sales_ledger_id
) shipping_status_counts ON sl.id = shipping_status_counts.sales_ledger_id
- left join sales_ledger_product slp on po.sale_ledger_product_id = slp.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 sales_ledger_product slp on po.sale_ledger_product_id = slp.id and slp.type = 1
left join product_process_route ppr on po.id = ppr.product_order_id
left join product_bom pb on pb.id = ppr.bom_id
<where>
@@ -62,13 +65,13 @@
</if>
</where>
</select>
- <select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
+ <select id="listProcessRoute" resultType="com.ruoyi.production2.pojo.ProcessRoute">
select pr.*
from process_route pr
left join product_model pm on pr.product_model_id = pm.id
where pm.id = #{productModelId}
</select>
- <select id="listProcessBom" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listProcessBom" resultType="com.ruoyi.production2.dto.ProductStructureDto">
select ps.id,
ps.product_model_id,
ps.process_id,
--
Gitblit v1.9.3