From af0f58e4b39a363b73587fa1b4cce7be46e203f5 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 12 九月 2025 15:07:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml
index 9aee0db..d0edb60 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml
@@ -8,10 +8,21 @@
t1.work_order_code AS text,
t1.id AS value,
t2.factory_code factoryCode,
+ t2.production_type productionType,
t3.shift_code shiftCode
FROM mes_production_work_order t1
LEFT JOIN base_factory t2 ON t1.factory_id = t2.id
LEFT JOIN base_shift t3 ON t1.shift_id = t3.id
${ew.customSqlSegment}
</select>
+
+ <select id="queryWorkOrderByTransfer" resultType="org.jeecg.modules.mes.entity.MesProductionWorkOrder">
+ SELECT t1.*
+ FROM mes_production_work_order t1
+ LEFT JOIN base_factory t2 ON t1.factory_id = t2.id
+ where t1.work_order_status = 'PUBLISHED'
+ and t2.production_type in ('ASSEMBLE', 'HEATTREATMENT')
+ and t1.plan_quantity > 0
+ order by t1.create_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3