From a0f44792c6ba7978c0e3c9a09ebc06a94ffc11e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 一月 2024 09:54:20 +0800
Subject: [PATCH] #任务管理增减优先级、排序、搜索
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 00a2fbf..dba67fe 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -16,6 +16,8 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.utils.SaasUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +25,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.*;
@RestController
@@ -90,7 +94,7 @@
@RequestMapping(value = "/taskWrk/updatePoint/auth")
@ManagerAuth
- public R updatePoint(TaskWrk taskWrk){
+ public R updatePoint(TaskWrk taskWrk) throws UnknownHostException {
if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
@@ -98,10 +102,25 @@
if (taskWrk1 == null) {
return R.error();
}
+ InetAddress localHost = InetAddress.getLocalHost();
+ String ipAddress = localHost.getHostAddress();
+
+ SaasUtils.insertLog(1,taskWrk1.getStartPoint()+"-"+taskWrk1.getTargetPoint(),taskWrk.getStartPoint()+"-"+taskWrk.getTargetPoint(), ipAddress,getUser().getUsername());
+
+
taskWrk1.setStartPoint(taskWrk.getStartPoint());
taskWrk1.setTargetPoint(taskWrk.getTargetPoint());
+ if (taskWrk1.getIoType() == 1){
+ taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint()));
+ } else if (taskWrk1.getIoType() == 2) {
+ taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint()));
+ } else if (taskWrk1.getIoType() == 3) {
+ taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint()));
+ taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint()));
+ }
taskWrk1.setModiTime(new Date());
taskWrk1.setModiUser(getUserId());
+
taskWrkService.updateById(taskWrk1);
return R.ok();
}
@@ -276,6 +295,36 @@
taskWrkService.updateById(taskWrk);
return R.ok();
}
+ @PostMapping(value = "/taskWrk/upIoPri")
+ public R upIoPri(@RequestParam String taskNo){
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk.getIoPri() > 300){
+ return R.error("浼樺厛绾у凡鏈�楂�");
+ }
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(100,200);map.put(200,300);map.put(300,400);
+ Integer pri = map.get(taskWrk.getIoPri());
+ taskWrk.setIoPri(pri);
+ if (!taskWrkService.updateById(taskWrk)){
+ return R.error("澧炲姞浼樺厛绾уけ璐�");
+ }
+ return R.ok();
+ }
+ @PostMapping(value = "/taskWrk/downIoPri")
+ public R downIoPri(@RequestParam String taskNo){
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk.getIoPri() <200){
+ return R.error("浼樺厛绾у凡鏈�浣�");
+ }
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(200,100);map.put(300,200);map.put(400,300);
+ Integer pri = map.get(taskWrk.getIoPri());
+ taskWrk.setIoPri(pri);
+ if (!taskWrkService.updateById(taskWrk)){
+ return R.error("闄嶄綆浼樺厛绾уけ璐�");
+ }
+ return R.ok();
+ }
public static String getTaskType(Integer paramIoType){
switch (paramIoType){
--
Gitblit v1.9.1