From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示

---
 inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
index 3e75545..ad1f973 100644
--- a/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
+++ b/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
@@ -15,9 +15,13 @@
             <result property="cellId" column="cell_id" jdbcType="INTEGER"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id,ins_sample_id,state,
-        create_time,update_time,create_user,
-        update_user,cell_id
-    </sql>
+    <select id="getUserNameById" resultType="java.lang.String">
+        select name from user where id = #{userId}
+    </select>
+    <select id="getHistoryListBySampleId" resultType="com.yuanchu.mom.dto.HistoryDto">
+        select wh.*,u.name createUserName from warehouse_history wh
+        left join user u on u.id = wh.create_user
+        where wh.ins_sample_id = #{sampleId}
+        order by wh.id desc 
+    </select>
 </mapper>

--
Gitblit v1.9.3