From 5a07bb3f4e4846ac5425b5ec73d4017e2b7c57dd Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 16 四月 2026 12:44:40 +0800
Subject: [PATCH] erp上报完成时间修复
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 16 +++++++++++-----
src/main/java/com/zy/asrs/controller/WrkMastController.java | 6 ++++--
src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java | 3 ---
src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java | 3 ---
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 7fa4e46..4602459 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -117,8 +117,10 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
- wrapper.like("wrk_no", condition);
- Page<WrkMast> page = wrkMastService.selectPage(new Page<>(0, 10), wrapper);
+ if (!Cools.isEmpty(condition)) {
+ wrapper.where("CAST(wrk_no AS VARCHAR(20)) LIKE {0}", "%" + condition + "%");
+ }
+ Page<WrkMast> page = wrkMastService.selectPage(new Page<>(1, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (WrkMast wrkMast : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 2e9a168..290e42d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -87,7 +87,11 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ if ("manu_type".equals(entry.getKey())) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
@@ -137,13 +141,15 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
+ if (!Cools.isEmpty(condition)) {
+ wrapper.where("CAST(wrk_no AS VARCHAR(20)) LIKE {0}", "%" + condition + "%");
+ }
+ Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(1, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (WrkMastLog wrkMastLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastLog.getId());
- map.put("value", wrkMastLog.getId());
+ map.put("id", wrkMastLog.getWrkNo());
+ map.put("value", wrkMastLog.getWrkNo());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
index d0db053..f0698dd 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -211,9 +211,6 @@
// }
private Date resolveCreateTime(WrkMast wrkMast) {
- if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
- return wrkMast.getCrnEndTime();
- }
if (!Cools.isEmpty(wrkMast.getModiTime())) {
return wrkMast.getModiTime();
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
index e7b5785..7963832 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
@@ -150,9 +150,6 @@
}
private Date resolveCreateTime(WrkMast wrkMast) {
- if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
- return wrkMast.getCrnEndTime();
- }
if (!Cools.isEmpty(wrkMast.getModiTime())) {
return wrkMast.getModiTime();
}
--
Gitblit v1.9.1