From 0cd7adb27af908b7d0ce0db697f9567d77bcbeb2 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 30 八月 2024 13:44:56 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7dbab85..285ed9a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -35,6 +35,7 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -141,7 +142,7 @@
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
} else {
@@ -207,7 +208,7 @@
if (null != devpThread) {
StaProtocol staProtocol = devpThread.getStation().get(siteId);
if (staProtocol != null) {
- BasDevp basDevp = basDevpService.selectById(siteId);
+ BasDevp basDevp = basDevpService.getById(siteId);
if (basDevp == null) {
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
@@ -215,7 +216,7 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ WrkMast wrkMast = wrkMastService.getById(staProtocol.getWorkNo());
if (wrkMast != null) {
vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
@@ -249,7 +250,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
@@ -261,7 +262,7 @@
}
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setSourceStaNo(wrkMast.getSourceStaNo$());
vo.setStaNo(wrkMast.getStaNo$());
--
Gitblit v1.9.1