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/InStoreDetailServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
index 49fe595..0671d0a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
@@ -40,9 +40,17 @@
if (StringUtils.isNotBlank(classifyId)) {
queryWrapper.eq("t2.id", classifyId);
}
+ String toolCode = query.get("toolCode");
+ if (StringUtils.isNotBlank(toolCode)) {
+ queryWrapper.like("t1.tool_code", toolCode);
+ }
+ String toolModel = query.get("toolModel");
+ if (StringUtils.isNotBlank(toolModel)) {
+ queryWrapper.like("t1.tool_mode", toolModel);
+ }
// 鎺掑簭鍐欐硶
List<OrderItem> orderItems = new ArrayList<>();
- orderItems.add(OrderItem.desc("t1.create_time"));
+ orderItems.add(OrderItem.desc("t.create_time"));
((Page<Map>) pageData).setOrders(orderItems);
}
return super.getBaseMapper().findPageList(pageData,queryWrapper);
--
Gitblit v1.9.3