From 44b18be16f09b1d934ee7bc98a34d8bcf85d050e Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 09 九月 2025 20:46:52 +0800
Subject: [PATCH] 报工接口，新增下拉框适配
---
src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java | 8 ++++++++
src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml | 2 ++
src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 45 +++++++++++++++++++++++++++++++--------------
src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java | 1 +
4 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 040d6e0..968e0e3 100644
--- a/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -209,31 +209,48 @@
return Collections.emptyList();
}
+ // @Override
+// public EamEquipment selectByEquipmentCode(String equipmentCode) {
+// if (StringUtils.isBlank(equipmentCode)) {
+// return null;
+// }
+// QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+// //鐢ㄦ埛鏁版嵁鏉冮檺
+// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+// if (sysUser == null) {
+// return null;
+// }
+// if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+// //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+// List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+// queryWrapper.in("equipment_code", equipArr);
+// } else {
+// //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+// queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
+// }
+// queryWrapper.eq("equipment_code", equipmentCode);
+// queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+//
+// return eamEquipmentMapper.selectOne(queryWrapper);
+// }
+
+ /**
+ *
+ * @param equipmentCode
+ * @return
+ */
@Override
public EamEquipment selectByEquipmentCode(String equipmentCode) {
if (StringUtils.isBlank(equipmentCode)) {
return null;
}
QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
- //鐢ㄦ埛鏁版嵁鏉冮檺
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (sysUser == null) {
- return null;
- }
- if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
- //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
- queryWrapper.in("equipment_code", equipArr);
- } else {
- //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
- }
+ // 绉婚櫎鐢ㄦ埛鏁版嵁鏉冮檺杩囨护锛岀洿鎺ユ牴鎹澶囩紪鐮佹煡璇�
queryWrapper.eq("equipment_code", equipmentCode);
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
return eamEquipmentMapper.selectOne(queryWrapper);
}
-
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
index 87e8b9d..22bac4b 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
@@ -104,6 +104,7 @@
List<Map<String, Object>> res = orderList.stream().map(order -> {
Map<String, Object> map = new HashMap<>();
map.put("title", order.getOrderCode());
+ map.put("text", order.getOrderCode());
map.put("label", order.getOrderCode());
map.put("value", order.getId());
return map;
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
index 9806cd4..f11b2f7 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
@@ -162,4 +162,12 @@
/**鐝鍚嶇О*/
@TableField(exist = false)
private String shiftName;
+
+ /**鐢熶骇宸ュ崟*/
+ @TableField(exist = false)
+ private String text;
+
+ /**鐢熶骇宸ュ崟id*/
+ @TableField(exist = false)
+ private String value;
}
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..9aee0db 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,6 +5,8 @@
<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,
t3.shift_code shiftCode
FROM mes_production_work_order t1
--
Gitblit v1.9.3