From 5b25d65a9e86fd45861f89104e6996dc2c387e1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 06 五月 2025 16:07:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/DevopsController.java | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DevopsController.java b/src/main/java/com/zy/asrs/controller/DevopsController.java
index 2470daf..863c2d2 100644
--- a/src/main/java/com/zy/asrs/controller/DevopsController.java
+++ b/src/main/java/com/zy/asrs/controller/DevopsController.java
@@ -55,7 +55,7 @@
List<DevopsMessage> devopsMessages = new ArrayList<>();
DevopsMessage devopsMessage;
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnSlave.getId()).in("io_type", 101, 103, 107).orderBy("wrk_sts", false));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnSlave.getId()).orderBy("wrk_sts", false));
//鍏堟煡璇㈠爢鍨涙満鏄惁鍦ㄥ伐浣�
WrkMast working = wrkMastMapper.selectWorking(crnSlave.getId());
for (WrkMast wrkMast : wrkMasts) {
@@ -70,7 +70,9 @@
}
continue;
}
- List<ErrorType> staError = isStaError(wrkMast);
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(wrkMast.getStaNo());
+ List<ErrorType> staError = isStaError(staProtocol, wrkMast);
for (ErrorType type : staError) {
if (!Cools.isEmpty(devopsMessage.getError())) {
devopsMessage.setError(devopsMessage.getError() + ";" + type.getDesc());
@@ -80,7 +82,9 @@
devopsMessage.setMethod(type.getMethod());
}
}
- List<ErrorType> crnError = isCrnError(wrkMast);
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ List<ErrorType> crnError = isCrnError(crnProtocol, wrkMast);
for (ErrorType type : crnError) {
if (!Cools.isEmpty(devopsMessage.getError())) {
devopsMessage.setError(devopsMessage.getError() + ";" + type.getDesc());
@@ -96,73 +100,80 @@
return R.ok(devopsMessages);
}
- private List<ErrorType> isStaError(WrkMast staNo) {
+ private List<ErrorType> isStaError(StaProtocol staProtocol, WrkMast wrkMast) {
List<ErrorType> types = new ArrayList<>();
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol = devpThread.getStation().get(staNo);
if (staProtocol == null) {
types.add(ErrorType.ERROR);
return types;
} else {
staProtocol = staProtocol.clone();
}
+ // 鑷姩
if (staProtocol.isAutoing()) {
types.add(ErrorType.FEIZIDONG);
}
- if (staProtocol.isLoading()) {
- types.add(ErrorType.YOUWU);
- }
- if (staProtocol.getWorkNo() == 0) {
- types.add(ErrorType.GONGZUOHAO);
- }
- if (staProtocol.getStaNo() == null) {
- types.add(ErrorType.STANO);
+ if (wrkMast.getIoType() > 100) {
+ // 鍑哄簱鏍￠獙
+ // 鏈夌墿
+ if (staProtocol.isLoading()) {
+ types.add(ErrorType.YOUWU);
+ } // 宸ヤ綔鍙锋槸鍚︿负0
+ if (staProtocol.getWorkNo() == 0) {
+ types.add(ErrorType.GONGZUOHAO);
+ }
+ // 鐩爣绔欑偣
+ if (staProtocol.getStaNo() == null) {
+ types.add(ErrorType.STANO);
+ }
+ } else {
+ // 鍏ュ簱鏍￠獙
+
}
return types;
}
- private List<ErrorType> isCrnError(WrkMast wrkMast) {
+ private List<ErrorType> isCrnError(CrnProtocol crnProtocol, WrkMast wrkMast) {
List<ErrorType> types = new ArrayList<>();
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-
+ // 鍫嗗灈鏈烘槸鍚︾┖闂�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE) {
types.add(ErrorType.CRN_NO_IDLE);
}
+ //浠诲姟鍙锋槸鍚︿负0
if (crnProtocol.getTaskNo() == 0) {
types.add(ErrorType.WORKING);
}
+ // 鍫嗗灈鏈烘槸鍚﹁嚜鍔�
if (crnProtocol.getModeType() == CrnModeType.AUTO) {
types.add(ErrorType.CRN_FEIZIDONG);
}
+ // 杞借揣鍙版湁鐗�
if (crnProtocol.getLoaded() == 0) {
types.add(ErrorType.LOAD);
}
+ // 鍫嗗灈鏈哄彇璐т腑
if (crnProtocol.statusType == CrnStatusType.FETCHING) {
types.add(ErrorType.WORKING);
}
+ // 鏀捐揣涓�
if (crnProtocol.statusType == CrnStatusType.PUTTING) {
types.add(ErrorType.WORKING);
}
+ // 鍫嗗灈鏈虹瓑寰呯‘璁ょ姸鎬�
if (crnProtocol.statusType == CrnStatusType.WAITING) {
types.add(ErrorType.WORKING);
}
+ // 璐у弶鏄惁浼氬洖涓�
if (crnProtocol.forkPosType == CrnForkPosType.HOME) {
types.add(ErrorType.HOME);
}
- if (crnProtocol.modeType == CrnModeType.AUTO) {
- types.add(ErrorType.FEIZIDONG);
- }
-
return types;
}
-
@PostMapping("/site/list")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
+ public R siteTable() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
@@ -174,14 +185,19 @@
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
for (BasDevp devp : basDevps) {
StaProtocol staProtocol = station.get(devp.getDevNo());
- if (null == staProtocol) { continue; }
+ if (null == staProtocol) {
+ continue;
+ }
SiteTableVo vo = new SiteTableVo();
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
list.add(vo);
}
return R.ok().add(list);
--
Gitblit v1.9.1