From 663120b055dfdced4a67ce1d4160ae8ca19b4190 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 12 三月 2026 18:04:21 +0800
Subject: [PATCH] 修改工单所需数量
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 7fe84fa..77f440e 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -15,16 +15,15 @@
</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
<where>
<if test="c.npsNo != null and c.npsNo != ''">
and po.nps_no like concat('%',#{c.npsNo},'%')
@@ -32,19 +31,19 @@
<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},'%')
</if>
<if test="c.specificationModel != null and c.specificationModel != ''">
and slp.specification_model like concat('%',#{c.specificationModel},'%')
</if>
+ <if test="c.startTime != null and c.endTime != null">
+ and po.create_time between #{c.startTime} and #{c.endTime}
+ </if>
</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,
@@ -61,6 +60,28 @@
left join sales_ledger_product slp on pm.id = slp.product_model_id
where slp.id = #{productModelId}
</select>
+ <select id="listProcessBom" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ select ps.id,
+ ps.product_model_id,
+ ps.process_id,
+ ps.unit_quantity,
+ ps.unit_quantity * po.quantity as demandedQuantity,
+ ps.unit,
+ p.product_name,
+ pp.name as process_name,
+ pm.product_id,
+ pm.model,
+ ps.material_type
+ from
+ product_structure ps
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join product_process pp on ps.process_id = pp.id
+ left join product_process_route ppr on ps.bom_id = ppr.bom_id
+ left join product_order po on po.id = ppr.product_order_id
+ where ppr.product_order_id = #{orderId}
+ order by ps.id
+ </select>
</mapper>
--
Gitblit v1.9.3