From 375f337b2a91e59beb0b41dc89353de1e92aa6a1 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 18:54:50 +0800
Subject: [PATCH] agv工作档增加 is_deleted
---
src/main/java/com/zy/asrs/controller/TaskController.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++--
4 files changed, 7 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 2270bac..4a03883 100644
--- a/src/main/java/com/zy/asrs/controller/TaskController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskController.java
@@ -40,6 +40,7 @@
EntityWrapper<Task> wrapper = new EntityWrapper<>();
excludeTrash(param);
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));
@@ -115,6 +116,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));
}
@@ -124,6 +126,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()) {
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2fdb225..4e573e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -214,7 +214,7 @@
throw new CoolException("鍏ュ簱绫诲瀷閿欒,type锛�" + type);
}
// 鏉＄爜瀛樺湪agv浠诲姟
- int count = taskService.selectCount(new EntityWrapper<Task>().eq("barcode", barcode));
+ int count = taskService.selectCount(new EntityWrapper<Task>().eq("barcode", barcode).eq("is_deleted", 0));
if (count > 0) {
throw new CoolException(barcode+ "锛氭潯鐮佸瓨鍦╝gv鎼繍浠诲姟!");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b86ad49..c5e27fd 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -93,7 +93,7 @@
try {
Integer wrkNo = Integer.parseInt(numericId);
task = taskService.selectOne(
- new EntityWrapper<Task>().eq("wrk_no", wrkNo)
+ new EntityWrapper<Task>().eq("wrk_no", wrkNo).eq("is_deleted", 0)
);
if (task != null) {
log.debug("閫氳繃宸ヤ綔鍙凤紙wrk_no={}锛夋壘鍒颁换鍔★紝taskId锛歿}", wrkNo, task.getId());
@@ -122,7 +122,7 @@
if (task == null) {
log.debug("閫氳繃宸ヤ綔鍙峰拰浠诲姟ID閮芥病鎵惧埌锛屽皾璇曢�氳繃鍏朵粬瀛楁鏌ヨ锛宼askId锛歿}", taskId);
task = taskService.selectOne(
- new EntityWrapper<Task>().eq("sheet_no", taskId)
+ new EntityWrapper<Task>().eq("sheet_no", taskId).eq("is_deleted", 0)
);
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index fb72cd5..293c750 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -75,7 +75,7 @@
return R.error("绔欑偣缂栧彿鍜屽伐浣滃彿涓嶈兘涓虹┖");
}
Task searchTask = taskService.selectOne(new EntityWrapper<Task>()
- .eq("source_sta_no", param.getStaNo())
+ .eq("source_sta_no", param.getStaNo()) .eq("is_deleted", 0)
);
if (!Cools.isEmpty(searchTask)){
return R.error("浠诲姟宸插瓨鍦�");
--
Gitblit v1.9.1