From 5058481100d938bc4680725c3659757a09a2dd8a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 03 六月 2026 17:50:39 +0800
Subject: [PATCH] 采集器调整:支持文件名匹配查找
---
src/main/java/com/chinaztt/mes/docx/util/TakeWords.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
index 4987848..284072e 100644
--- a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
+++ b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
@@ -490,7 +490,7 @@
return Result.failed("鏁版嵁搴撳悕鎴栬〃鍚嶄笉鑳戒负绌�");
}
// 鏁版嵁搴撹繛鎺ヤ俊鎭�
- String url = "jdbc:sqlserver://localhost:1433;DatabaseName="+dbName+";encrypt=true;trustServerCertificate=true";
+ String url = "jdbc:sqlserver://localhost:1433;DatabaseName="+dbName+";encrypt=false;trustServerCertificate=true";
Connection connection = null;
PreparedStatement preparedStatement = null;
ResultSet resultSet = null;
@@ -502,17 +502,17 @@
String sql = "SELECT * FROM "+table+" WHERE 1=1";
if(StringUtils.isNotBlank(getFileDto.getMdbEntrustCode()) ){
- sql+=" AND (" + getFileDto.getMdbEntrustCode() + " = TRIM('" + getFileDto.getEntrustCode()+ "')";
+ sql+=" AND (" + getFileDto.getMdbEntrustCode() + " = LTRIM(RTRIM('" + getFileDto.getEntrustCode()+ "'))";
if(StringUtils.isNotBlank(getFileDto.getLotBatchNo())){
- sql+=" OR "+ getFileDto.getMdbEntrustCode() + " = TRIM('" + getFileDto.getLotBatchNo()+ "')";
+ sql+=" OR "+ getFileDto.getMdbEntrustCode() + " = LTRIM(RTRIM('" + getFileDto.getLotBatchNo()+ "'))";
}
sql+=")";
}
if(StringUtils.isNotBlank(getFileDto.getMdbSampleCode())){
sql+=" AND " + getFileDto.getMdbSampleCode() + " = '" + getFileDto.getSampleCode() + "'";
}
- if(StringUtils.isNotBlank(getFileDto.getCableTag())){
- sql+=" AND Color = '" + getFileDto.getCableTag() + "'";
+ if(StringUtils.isNotBlank(getFileDto.getLastSql())){
+ sql+=getFileDto.getLastSql();
}
// 鍒涘缓 PreparedStatement 瀵硅薄鎵ц SQL
preparedStatement = connection.prepareStatement(sql);
@@ -550,4 +550,5 @@
}
return tableMap;
}
+
}
--
Gitblit v1.9.3