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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index c16a7c2..290e42d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/inventoryFlow/list/auth")
- @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍")
+// @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍")
public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@@ -87,7 +87,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("manu_type")) {
+ if ("manu_type".equals(entry.getKey())) {
wrapper.like(entry.getKey(), val);
} else {
wrapper.eq(entry.getKey(), val);
@@ -141,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);
--
Gitblit v1.9.1