From 5cf81e2b0e9c3490f83a06811ea6939c5b5ae7c7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 23 五月 2024 16:45:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 2ec6529..3d9ecc1 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -8,9 +8,11 @@
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.CommandInfoService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -43,6 +45,8 @@
@Autowired
private CommandInfoService commandInfoService;
+ @Autowired
+ private LocMastService locMastService;
@RequestMapping(value = "/taskWrk/{wrkNo}/auth")
@ManagerAuth
@@ -104,6 +108,22 @@
if (taskWrk1 == null) {
return R.error();
}
+ if ((taskWrk1.getIoType() == 1 || taskWrk1.getIoType() == 3) && taskWrk1.getWrkSts() >= 3 ){
+ return R.error("浠诲姟宸插湪鎵ц锛屾棤娉曚慨鏀�");
+ }
+ if ((taskWrk1.getIoType() == 2 ) && taskWrk1.getWrkSts() >= 12 ){
+ return R.error("浠诲姟宸插湪鎵ц锛屾棤娉曚慨鏀�");
+ }
+ if (Cools.isEmpty(taskWrk1.getStartPoint()) || Cools.isEmpty(taskWrk1.getTargetPoint())){
+ return R.error("浠诲姟鏈垎閰嶅簱浣嶏紝鏃犳硶淇敼");
+ }
+
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+ if (!Cools.isEmpty(commandInfos)){
+ for (CommandInfo commandInfo:commandInfos){
+ commandInfoService.deleteById(commandInfo);
+ }
+ }
InetAddress localHost = InetAddress.getLocalHost();
String ipAddress = localHost.getHostAddress();
@@ -120,6 +140,7 @@
taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint()));
taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint()));
}
+ taskWrk1.setStatus(1);
taskWrk1.setModiTime(new Date());
taskWrk1.setModiUser(getUserId());
@@ -243,6 +264,25 @@
taskWrkService.updateById(taskWrk);
+ if (taskWrk.getIoType() == 1) {
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("Z");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2) {
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("K");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ }
+
+
if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
//浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
commandInfoService.saveToHistory(taskWrk.getTaskNo());
--
Gitblit v1.9.1