From b0ae9e5d1c8add200ded8957c068223b9703c1e3 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期三, 27 八月 2025 18:00:09 +0800
Subject: [PATCH] feat(cms): 为 RatedLife 实体添加字典注解- 在 RatedLife 实体的 cuttingId 字段上添加了 @Dict 注解 - 优化了 RatedLifeController 中的代码格式和注释
---
src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml
index 52eb013..1bf443e 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesMaterialLoadingMapper">
-
+ <select id="queryUnloadingByLoadingId" resultType="org.jeecg.modules.mes.entity.MesMaterialUnloading">
+ select * from mes_material_unloading where loading_id = #{loadingId} and del_flag = 0 order by create_time desc
+ </select>
+ <select id="queryLoadingByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
+ select mml.* ,mpwo.work_order_code as workOrderCode
+ from mes_material_loading mml
+ left join mes_production_work_order mpwo on mml.work_order_id = mpwo.id
+ where mml.work_order_id = #{workOrderId}
+ and mml.del_flag = 0
+ </select>
+ <select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
+ SELECT
+ t1.*,
+ t2.work_order_code workOrderCode,
+ t3.equipment_name equipmentName
+ FROM mes_material_loading t1
+ LEFT JOIN mes_production_work_order t2 ON t1.work_order_id = t2.id
+ LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3