From 7bde96aaac4fcbd3afe4532e53f515f82c04a121 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 16 三月 2026 11:59:09 +0800
Subject: [PATCH] fix(production): 优化报工投入品数量计算及库存校验逻辑
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 28e03b5..77f440e 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -15,15 +15,12 @@
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
- sl.sales_contract_no,
- sl.customer_name,
slp.product_category,
slp.specification_model,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus
from product_order po
- left join sales_ledger sl on po.sales_ledger_id = sl.id
left join sales_ledger_product slp on po.product_model_id = slp.id
left join product_process_route ppr on po.id = ppr.product_order_id
left join product_bom pb on pb.id = ppr.bom_id
@@ -33,9 +30,6 @@
</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.productCategory != null and c.productCategory != ''">
and slp.product_category like concat('%',#{c.productCategory},'%')
@@ -49,7 +43,7 @@
</where>
</select>
<select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,
+ select po.*,F
pwo.work_order_no,
pwo.report_work,
pwo.status,
@@ -76,7 +70,8 @@
p.product_name,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ ps.material_type
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
--
Gitblit v1.9.3