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 | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskController.java b/src/main/java/com/zy/asrs/controller/TaskController.java
index b453629..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.*;
@@ -40,7 +39,11 @@
@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), "desc".equals(orderByType));
@@ -58,6 +61,25 @@
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);
}
@@ -104,6 +126,9 @@
} 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();
}
@@ -116,6 +141,7 @@
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));
}
@@ -125,6 +151,7 @@
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()) {
--
Gitblit v1.9.1