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/ToolsSharpeningServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java
index 5a64898..f05572d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java
@@ -32,13 +32,17 @@
if (toolIds != null && toolIds.length > 0) {
queryWrapper.like("t.tool_id", toolIds[0]);
}
- String[] startTimes = parameterMap.get("startTime");
- if (startTimes != null && startTimes.length > 0) {
- queryWrapper.ge("t.create_time", startTimes[0]);
+ String[] sharpeningResults = parameterMap.get("sharpeningResult");
+ if (sharpeningResults != null && sharpeningResults.length > 0) {
+ queryWrapper.like("t.sharpening_result", sharpeningResults[0]);
}
- String[] endTimes = parameterMap.get("endTime");
+ String[] startTimes = parameterMap.get("sharpeningTimeBegin ");
+ if (startTimes != null && startTimes.length > 0) {
+ queryWrapper.ge("t.sharpening_time", startTimes[0]);
+ }
+ String[] endTimes = parameterMap.get("sharpeningTimeEnd");
if (endTimes != null && endTimes.length > 0) {
- queryWrapper.le("t.create_time", endTimes[0]);
+ queryWrapper.le("t.sharpening_time", endTimes[0]);
}
queryWrapper.orderByDesc("t.create_time");
return this.baseMapper.queryPageList(page, queryWrapper);
--
Gitblit v1.9.3