From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index d56f44d..8785527 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -20,7 +20,7 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.TaskWrkService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -28,6 +28,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.DevpType.DevpStateType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
@@ -57,8 +58,6 @@
@Autowired
private SlaveProperties slaveProperties;
@Autowired
- private WrkMastService wrkMastService;
- @Autowired
private BasDevpService basDevpService;
@Autowired
private LocMastMapper locMastMapper;
@@ -70,6 +69,8 @@
private DeviceErrorService deviceErrorService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private TaskWrkService taskWrkService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -115,9 +116,8 @@
SiteLatestDataVo vo = new SiteLatestDataVo();
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
- vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
vos.add(vo);
}
return R.ok().add(vos);
@@ -151,9 +151,9 @@
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
+ if (taskWrk != null) {
+ vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
} else {
vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
}
@@ -276,22 +276,22 @@
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
vo.setSiteId(siteId); // 绔欑偣缂栧彿
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
- if (wrkMast != null) {
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
+ if (taskWrk != null) {
+ vo.setWrkSts(taskWrk.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(taskWrk.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceStaNo(null);
+ vo.setStaNo(null);
+ vo.setSourceLocNo(taskWrk.getStartPoint());
+ vo.setLocNo(taskWrk.getTargetPoint());
}
}
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
vo.setCanining(basDevp.getCanining()); // 鑳藉叆
vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
@@ -330,14 +330,14 @@
}
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
+ if (taskWrk != null) {
+ vo.setSourceStaNo(null);
+ vo.setStaNo(null);
+ vo.setWrkSts(taskWrk.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(taskWrk.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(taskWrk.getStartPoint());
+ vo.setLocNo(taskWrk.getTargetPoint());
vo.setCrnStatus(crnProtocol.getStatusType().desc);
vo.setError(""); // todo
}
--
Gitblit v1.9.1