From 020f48adb61a0350924783c1b397bd381d20ddc8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 11:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs' into jxtlfwcs
---
src/main/resources/mapper/LocMastMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 5b4c293..03bb74a 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -34,6 +34,9 @@
<result column="mk" property="mk" />
<result column="barcode" property="barcode" />
<result column="ctn_no" property="ctnNo" />
+ <result column="pack_status" property="packStatus" />
+ <result column="fire_status" property="fireStatus" />
+ <result column="fire_no" property="fireNo" />
<result column="channel" property="channel" />
</resultMap>
@@ -61,7 +64,7 @@
</select>
<select id="selectztgx" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where loc_sts in (#{sts1},#{sts2}) and channel=#{count}+1
+ select top 1 * from asr_loc_mast where loc_sts in (#{sts1}) and channel=#{count}+1
</select>
</mapper>
--
Gitblit v1.9.1