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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 2573e68..290e42d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.WrkMastLog;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.WrkMastLog;
+import com.zy.asrs.service.WrkMastLogService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,29 +39,59 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){
if (orderByField.endsWith("$")){
orderByField = orderByField.substring(0, orderByField.length()-1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}else {
- wrapper.orderBy("io_time", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ @RequestMapping(value = "/inventoryFlow/list/auth")
+// @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍")
+ public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ if (Cools.isEmpty(param.get("io_time"))) {
+ param.put("startTime","");
+ param.put("endTime","");
+ } else {
+ String ioTime = (String) param.get("io_time");
+ if (ioTime.contains(RANGE_TIME_LINK)){
+ String[] dates = ioTime.split(RANGE_TIME_LINK);
+ param.put("startTime",dates[0]);
+ param.put("endTime",dates[1]);
+ }
+ }
+ return wrkMastLogService.inventoryFlowList(curr,limit,param);
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ if ("manu_type".equals(entry.getKey())) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
@@ -111,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