From 5c58ac36853e09b09498ac2ed75bf5a9e7b80e12 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:35:25 +0800
Subject: [PATCH] 浪潮对接单点登录:能耗管理系统2
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index ac0348a..06f79e1 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -25,9 +25,10 @@
pm.model,
pm.unit,
p.product_name AS productName,
- po.nps_no AS productOrderNpsNo
+ po.nps_no AS productOrderNpsNo,
+ ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus
FROM
- `product_work_order` pwo
+ product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
LEFT JOIN product_order po ON po.id = pwo.product_order_id
LEFT JOIN product_process pp ON pp.id = ppri.process_id
@@ -37,35 +38,9 @@
<if test="c.workOrderNo != null and c.workOrderNo != ''">
pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
</if>
+ <if test="c.planStartTime != null and c.planEndTime != null">
+ and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
+ </if>
</where>
</select>
- <select id="selectProductWorkOrderDtoList" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
- select *
- from product_work_order pwo
- left join product_order po on po.id = pwo.product_order_id
- </select>
-
- <update id="updatePlanQuantity" parameterType="java.util.Map">
- UPDATE product_work_order
- SET
- report_work = #{reportWork},
- quantity = #{quantity},
- plan_quantity = plan_quantity - #{deductQuantity},
- product_main_id = #{productMainId}
- WHERE id = #{workOrderId}
- </update>
-
- <update id="rollbackPlanQuantity" parameterType="java.lang.Long">
- UPDATE product_work_order pwo
- INNER JOIN production_product_main ppm
- ON pwo.id = ppm.work_order_id
- AND ppm.id = #{productMainId}
- INNER JOIN production_product_output ppo
- ON ppo.product_main_id = ppm.id
- SET
- pwo.plan_quantity = pwo.plan_quantity + ppo.quantity,
- pwo.report_work = 0,
- pwo.quantity = 0
- WHERE pwo.id = ppm.work_order_id
- </update>
</mapper>
--
Gitblit v1.9.3