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/service/impl/OutStoreDetailServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
index 7f0709d..7a7015c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
@@ -30,6 +30,14 @@
if (classifyIds != null && classifyIds.length > 0) {
queryWrapper.eq("t2.classify_id", classifyIds[0]);
}
+ String[] toolCodes = parameterMap.get("toolCode");
+ if (toolCodes != null && toolCodes.length > 0) {
+ queryWrapper.like("t2.tool_code", toolCodes[0]);
+ }
+ String[] toolModels = parameterMap.get("toolModel");
+ if (toolModels != null && toolModels.length > 0) {
+ queryWrapper.like("t2.tool_model", toolModels[0]);
+ }
queryWrapper.orderByDesc("t1.create_time");
return this.baseMapper.queryPageList(page, queryWrapper);
}
--
Gitblit v1.9.3