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/mapper/xml/MesMaterialLoadingMapper.xml | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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..fb86d6e 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,13 +2,43 @@
<!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
- 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 id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
+ select *
+ from (SELECT m.id,
+ m.create_by,
+ m.create_time,
+ m.material_number,
+ m.material_name,
+ m.factory_id,
+ m.warehouse_id,
+ m.batch_number,
+ m.steel_ball_size,
+ m.quantity,
+ m.remaining_quantity,
+ m.unloading_flag,
+ 'LOADING' AS category
+ FROM mes_material_loading m
+ WHERE m.del_flag = 0
+ UNION ALL
+ SELECT t1.id,
+ t1.create_by,
+ t1.create_time,
+ t1.material_number,
+ t1.material_name,
+ t2.factory_id,
+ t2.warehouse_id,
+ t2.batch_number,
+ t2.steel_ball_size,
+ t2.quantity,
+ t2.remaining_quantity,
+ t2.unloading_flag,
+ 'UNLOADING' AS category
+ FROM mes_material_unloading t1
+ INNER JOIN mes_material_loading t2 ON t1.loading_id = t2.id
+ WHERE t1.del_flag = 0) mml
+ ${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3