From 715101e29ad1eb8d70f587237a37d74d50d3fd2a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 15:23:28 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 +++++++++---------
src/main/java/com/zy/asrs/controller/TVController.java | 13 +++++++++----
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index bdaeea5..37b8cd5 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -225,15 +225,15 @@
*/
@GetMapping("/led")
public R monitorLed(@RequestParam("ledId") Integer ledId) {
- int dev_no = 1011;
+ int dev_no = 1012;
if (ledId == 1) {
- dev_no = 1011;
+ dev_no = 1012;
} else if (ledId == 2) {
dev_no = 1014;
} else if (ledId == 3) {
dev_no = 1021;
} else if (ledId == 4) {
- dev_no = 1025;
+ dev_no = 1024;
}
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", dev_no));
if (Cools.isEmpty(basDevp)) {
@@ -242,9 +242,12 @@
if (Cools.isEmpty(basDevp.getWrkNo1())) {
return R.ok();
}
+ if (basDevp.getWrkNo() == null || basDevp.getWrkNo() == 0) {
+ return R.ok();
+ }
List<LedCommand> commands = new ArrayList<>();
Map<String, Object> param = new HashMap<>();
- param.put("taskNo", basDevp.getWrkNo1());
+ param.put("taskNo", basDevp.getWrkNo());
String response = null;
try {
response = new HttpHandler.Builder()
@@ -262,6 +265,8 @@
String data = jsonObject.getString("data");
List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
commands.addAll(wrkDetls);
+ } else {
+ return R.ok();
}
return R.ok().add(commands);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index acc29db..98bd691 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -957,7 +957,7 @@
staProtocol = staProtocol.clone();
staProtocol.setStaNo(staNo);
- staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setWorkNo(wrkMast.getMainWrkNo().shortValue());
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
wrkMast.setWrkSts(WrkStsType.INBOUND_DEVICE_RUN.sts);
@@ -1287,14 +1287,14 @@
Integer sourceLev = liftThread.getLevToStaNo(Utils.getLev(wrkMast.getSourceLocNo()));
//鑾峰彇鎻愬崌鏈哄懡浠�
- List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
+ List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getMainWrkNo(), sourceLev, wrkMast.getStaNo());
LiftCommand liftCommand = liftCommands.get(0);
- if (wrkMast.getMainWrkNo() != null) {
- liftCommand.setTaskNo(wrkMast.getMainWrkNo());
- } else {
- int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
- liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
- }
+// if (wrkMast.getMainWrkNo() != null) {
+ liftCommand.setTaskNo(wrkMast.getMainWrkNo());
+// } else {
+// int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
+// liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
+// }
ArrayList<LiftCommand> commands = new ArrayList<>();
commands.add(liftCommand);
@@ -1303,7 +1303,7 @@
LiftAssignCommand assignCommand = new LiftAssignCommand();
assignCommand.setCommands(commands);
assignCommand.setLiftNo(liftProtocol.getLiftNo().shortValue());
- assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
+ assignCommand.setTaskNo(wrkMast.getMainWrkNo().shortValue());
assignCommand.setTaskMode(LiftCommandModeType.PALLET_OUT.id.shortValue());
wrkMast.setWrkSts(WrkStsType.OUTBOUND_LIFT_RUN.sts);
--
Gitblit v1.9.1