From 62b9fa3e8696252c931769ef742a95edfd6597c7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 十一月 2023 10:59:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/core/WcsDispatcher.java | 7 -------
src/main/java/com/zy/asrs/controller/OpenController.java | 28 +++++++++++++++++++---------
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 6 +++++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1 +
src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java | 2 +-
5 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1576d6c..6806b2b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -122,6 +122,9 @@
}
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("鏈煡璇㈠埌浠诲姟锛屼换鍔″彿锛�"+param.getTaskNo());
+ }
return R.ok(taskWrk.getStartPoint());
}
@@ -137,12 +140,19 @@
} else if (Cools.isEmpty(param.getWharfCode())){
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
- BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
- if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
- return R.ok();
- }else {
- return R.error();
+
+ try{
+ BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
+ if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+ return R.ok();
+ }else {
+ return R.error();
+ }
+ }catch (Exception e){
+ log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
+ return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
}
+
}
//浠诲姟涓嬪彂鎺ュ彛
@@ -219,20 +229,20 @@
}
boolean sign =false;
switch (param.getTaskStatus()){
- case "1"://姝ｅ父鍙栨秷
+ case 1://姝ｅ父鍙栨秷
if (taskWrk.getWrkSts()>1){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- case "2"://寮哄埗鍙栨秷
+ case 2://寮哄埗鍙栨秷
if (taskWrk.getWrkSts()>3){
return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
break;
- case "3"://姝ｅ父瀹屾垚
+ case 3://姝ｅ父瀹屾垚
if (taskWrk.getWrkSts()>11){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- case "4"://寮哄埗瀹屾垚
+ case 4://寮哄埗瀹屾垚
if (taskWrk.getWrkSts()>14){
return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 080f9f4..914645f 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -159,7 +159,11 @@
Date now = new Date();
taskWrk.setStatus(TaskStatusType.CANCEL.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ try{
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ }catch (Exception e){
+ taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java b/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
index 16b8660..ab073ad 100644
--- a/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
@@ -32,7 +32,7 @@
* 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
* 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
* */
- private String taskStatus; //鎿嶄綔绫诲瀷
+ private Integer taskStatus; //鎿嶄綔绫诲瀷
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
// private String containerCode; //鎵樼洏缂栫爜
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 7ece655..9cb9d38 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -36,6 +36,7 @@
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
}
diff --git a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
index 64f09f0..ea2c49f 100644
--- a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
@@ -1,7 +1,5 @@
package com.zy.asrs.task.core;
-import com.zy.asrs.task.handler.WorkLogHandler;
-import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,11 +19,6 @@
private static final Logger log = LoggerFactory.getLogger(WcsDispatcher.class);
private Thread thread;
-
- @Autowired
- private WorkMastHandler workMastHandler;
- @Autowired
- private WorkLogHandler workLogHandler;
@Autowired
private ConfigService configService;
--
Gitblit v1.9.1