From a44f4b1c063af706404c71f4445aa2258b387e34 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 13:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml | 3 +++
1 files changed, 3 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 7fc05d7..d314f2e 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
@@ -5,7 +5,10 @@
<select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesProductionWorkOrder">
SELECT
t1.*,
+ 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
--
Gitblit v1.9.3