From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
index c1008ee..69e1807 100644
--- a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
+++ b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
@@ -28,7 +28,7 @@
</sql>
<select id="pageLensList" resultType="com.jilongda.manage.vo.TLensWarehousingDetailVO">
select tlwd.id, tlwd.warehousingId, tlwd.brand, tlwd.supplier, tlwd.series, tlwd.total, tlwd.refractiveIndex, tlwd.ballMirror, tlwd.code, tlwd.createTime,tlwd.columnMirror,
- tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`,tw.storeId
+ tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`,tw.storeId,tw.status as status
from t_lens_warehousing_detail tlwd
left join t_warehousing tw on tlwd.warehousingId = tw.id
<where>
@@ -61,6 +61,7 @@
</if>
and tlwd.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
</where>
+ and tw.status!=5
ORDER BY tlwd.createTime DESC
</select>
--
Gitblit v1.7.1