From 7f43845a6289a2ba7c6c1c313501674b59892cb7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 26 八月 2025 15:00:42 +0800
Subject: [PATCH] 齐套性检查、上下料查询相关接口

---
 src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml |   12 +++++++++++-
 1 files changed, 11 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 d7018e6..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
@@ -2,7 +2,7 @@
 <!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
+        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
@@ -11,4 +11,14 @@
         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