From 371462edc6b3ee1de97c235d4a019b544badda0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 14 二月 2026 22:09:37 +0800
Subject: [PATCH] AGV工作档界面和逻辑调整
---
src/main/java/com/zy/asrs/controller/TaskController.java | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskController.java b/src/main/java/com/zy/asrs/controller/TaskController.java
index 447233e..d4de145 100644
--- a/src/main/java/com/zy/asrs/controller/TaskController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.Task;
-import com.zy.asrs.service.TaskService;
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.Task;
+import com.zy.asrs.service.TaskService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,27 +31,55 @@
@RequestMapping(value = "/task/list/auth")
@ManagerAuth
- public R list(@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){
+ public R list(@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) {
EntityWrapper<Task> wrapper = new EntityWrapper<>();
excludeTrash(param);
+ // 绉婚櫎闈炶〃瀛楁鍙傛暟锛岄伩鍏� SQL 鎶ラ敊銆屽垪鍚� wrk_sts_cb 鏃犳晥銆嶏紙agv_task 鏃犳鍒楋紝澶氫负鍓嶇涓嬫媺鎻忚堪瀛楁锛�
+ param.remove("wrk_sts_cb");
+ param.remove("wrkStsCb");
convert(param, wrapper);
+ wrapper.eq("is_deleted", 0);
allLike(Task.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));
+ }
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderDesc(Arrays.asList("wrk_no"));
+ }
return R.ok(taskService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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 if (val.contains(",") && !Cools.isEmpty(val) && !val.equals("null")) {
+ // 澶氬�兼煡璇細浣跨敤 IN 鏌ヨ锛堥�傜敤浜庡伐浣滅姸鎬佺瓑澶氶�夊満鏅級
+ String[] values = val.split(",");
+ List<Object> valueList = new ArrayList<>();
+ for (String v : values) {
+ v = v.trim();
+ if (!Cools.isEmpty(v) && !v.equals("null")) {
+ // 灏濊瘯杞崲涓烘暟瀛楃被鍨嬶紙宸ヤ綔鐘舵�佹槸Long绫诲瀷锛�
+ try {
+ valueList.add(Long.parseLong(v));
+ } catch (NumberFormatException e) {
+ // 濡傛灉涓嶆槸鏁板瓧锛屼繚鎸佸瓧绗︿覆绫诲瀷
+ valueList.add(v);
+ }
+ }
+ }
+ if (!valueList.isEmpty()) {
+ wrapper.in(entry.getKey(), valueList);
+ }
} else {
wrapper.like(entry.getKey(), val);
}
@@ -66,10 +93,10 @@
return R.ok();
}
- @RequestMapping(value = "/task/update/auth")
- @ManagerAuth
- public R update(Task task){
- if (Cools.isEmpty(task) || null==task.getId()){
+ @RequestMapping(value = "/task/update/auth")
+ @ManagerAuth
+ public R update(Task task) {
+ if (Cools.isEmpty(task) || null == task.getId()) {
return R.error();
}
taskService.updateById(task);
@@ -78,8 +105,8 @@
@RequestMapping(value = "/task/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskService.deleteById(id);
}
return R.ok();
@@ -89,7 +116,7 @@
@RequestMapping("/task/control")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
- @RequestParam Integer type){
+ @RequestParam Integer type) {
if (type == 1) {
taskService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
@@ -99,19 +126,22 @@
} else if (type == 3) {
taskService.pickWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ } else if (type == 4) {
+ taskService.deleteWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍒犻櫎");
}
return R.ok();
}
-
@RequestMapping(value = "/task/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Task> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("task"));
convert(map, wrapper);
+ wrapper.eq("is_deleted", 0);
List<Task> list = taskService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@@ -121,9 +151,10 @@
public R query(String condition) {
EntityWrapper<Task> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
+ wrapper.eq("is_deleted", 0);
Page<Task> page = taskService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Task task : page.getRecords()){
+ for (Task task : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", task.getId());
map.put("value", task.getId());
@@ -136,7 +167,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Task> wrapper = new EntityWrapper<Task>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskService.selectOne(wrapper)){
+ if (null != taskService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Task.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1