From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml
index 196972c..879252c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml
@@ -22,4 +22,12 @@
         LEFT JOIN tms_warehouse p on t.parent_id = p.id
         ${ew.customSqlSegment}
     </select>
+    <select id="queryWarehouseDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
+        SELECT
+            id value,
+            ISNULL(warehouse_id, '') + '/' + ISNULL(warehouse_name, '') label,
+            ISNULL(warehouse_id, '') + '/' + ISNULL(warehouse_name, '') title
+        FROM tms_warehouse
+        WHERE status = '1' AND leaf_flag = '1'
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3