root/zhongDingTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
gengby
2022-12-11 16:40:23 +08:00
parent fa8a4dcad4
commit c31a99bce9
13 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
hd/logPath_IS_UNDEFINED/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/ACS请求ERP/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/ACS请求WMS/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/AGV请求离开/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/NDC/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/WMS下发ACS/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/反馈AGV请求/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/扫码记录/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/查询AGV指令状态/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/查询仙知AGV指令状态/2022-12-11.0.log Normal file
View File

0
hd/logPath_IS_UNDEFINED/自动创建指令/2022-12-11.0.log Normal file
View File

25
hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java
View File

@@ -47,7 +47,7 @@ public class AgvWaitUtil {
if (standardConveyorLineDeviceDriver.getMove() == 1 && standardConveyorLineDeviceDriver.getAction() == 1) {
feedMap.put("feedbackStatus", "applyTake");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = Integer.parseInt((String) feedback.get("responseCode"));
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = String.valueOf(feedback.get("responseMessage"));
if (responseCode == 0) {
feedback.put("feedbackStatus", "taking");
@@ -80,8 +80,9 @@ public class AgvWaitUtil {
standardCoveyorControlDeviceDriver.writing(1, "0");
feedMap.put("feedbackStatus", "applyTake");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = Integer.parseInt((String) feedback.get("responseCode"));
String responseMessage = String.valueOf(feedback.get("responseMessage"));
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = String.valueOf(feedback.get("responseMessage"));
if (responseCode == 0) {
feedback.put("feedbackStatus", "taking");
acsToWmsZDService.taskFeedback(feedMap);
@@ -123,7 +124,8 @@ public class AgvWaitUtil {
standardConveyorLineDeviceDriver.writing(2);
feedMap.put("feedbackStatus", "takeFinish");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = (int) feedback.get("responseCode");
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = (String) feedback.get("responseMessage");
if (responseCode == 0) {
map.put("status", 200);
@@ -151,7 +153,8 @@ public class AgvWaitUtil {
standardCoveyorControlDeviceDriver.writing(1, "2");
feedMap.put("feedbackStatus", "takeFinish");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = (int) feedback.get("responseCode");
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = (String) feedback.get("responseMessage");
if (responseCode == 0) {
map.put("status", 200);
@@ -191,7 +194,8 @@ public class AgvWaitUtil {
if (standardConveyorLineDeviceDriver.getMove() == 0 && standardConveyorLineDeviceDriver.getAction() == 2) {
feedMap.put("feedbackStatus", "applyPut");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = Integer.parseInt((String) feedback.get("responseCode"));
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = (String) feedback.get("responseMessage");
if (responseCode == 0) {
feedback.put("feedbackStatus", "puting");
@@ -224,7 +228,8 @@ public class AgvWaitUtil {
standardCoveyorControlDeviceDriver.writing(1, "0");
feedMap.put("feedbackStatus", "applyPut");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = Integer.parseInt((String) feedback.get("responseCode"));
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = (String) feedback.get("responseMessage");
if (responseCode == 0) {
feedback.put("feedbackStatus", "puting");
@@ -268,7 +273,8 @@ public class AgvWaitUtil {
standardConveyorLineDeviceDriver.writing(3);
feedMap.put("feedbackStatus", "putFinish");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = (int) feedback.get("responseCode");
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = (String) feedback.get("responseMessage");
if (responseCode == 0) {
map.put("status", 200);
@@ -296,7 +302,8 @@ public class AgvWaitUtil {
standardCoveyorControlDeviceDriver.writing(1, "3");
feedMap.put("feedbackStatus", "putFinish");
Map<String, Object> feedback = acsToWmsZDService.taskFeedback(feedMap);
int responseCode = (int) feedback.get("responseCode");
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = (String) feedback.get("responseMessage");
if (responseCode == 0) {
map.put("status", 200);

2
hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -902,7 +902,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS);
if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
JSONObject map = new JSONObject();
map.put("task_code",entity.getTask_code());
map.put("taskCode",entity.getTask_code());
map.put("reason","acs手动取消！");
acsToWmsZDService.taskDeprecate(map);
}