From 9d7bfe8cf15f1b34a87351560f39662d9e141cce Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 20 一月 2026 11:09:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 05e592c..833b07b 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -70,6 +70,10 @@
Integer wrkNo = null;
String taskNo = null;
Integer status = null;
+ String barcode = null;
+ String startPoint = null;
+ String targetPoint = null;
+ String allField = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -86,17 +90,25 @@
taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
+ } else if (entry.getKey().equals("barcode")) {
+ barcode = val;
+ } else if (entry.getKey().equals("startPoint")) {
+ startPoint = val;
+ } else if (entry.getKey().equals("targetPoint")) {
+ targetPoint = val;
+ } else if (entry.getKey().equals("allField")) {
+ allField = val;
}
}
+//
+// EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-
- List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
+ List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
- page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
return R.ok(page);
// return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
@@ -311,6 +323,16 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ try{
+ return this.delete(taskNo);
+ } catch (Exception e) {
+ return R.error();
+ }
+ }
if ((Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3) && !taskWrk.getStatus().equals(TaskStatusType.OVER3.id)){
return R.error("宸插畬缁撴垨宸插彇娑�") ;
}
@@ -394,8 +416,15 @@
@ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
public R cancel(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error();
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ try{
+ return this.delete(taskNo);
+ } catch (Exception e) {
+ return R.error();
+ }
}
if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
@@ -485,6 +514,12 @@
@ManagerAuth(memo = "杈撻�佺嚎涓嬪彂瀹屾垚")
public R returnAssign(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ return R.error("褰撳墠浠诲姟涓嶆敮鎸佹鎿嶄綔") ;
+ }
if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==1){
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//娲惧彂鐘舵��
taskWrk.setWrkSts(2);
--
Gitblit v1.9.1