From f5c0365702be7d445420a9961b1f2e64b621213b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 12:44:02 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 91 ++++++++++++++++--------------
src/main/java/com/zy/core/MainProcess.java | 31 +++++-----
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 6 +-
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 2
4 files changed, 69 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index c9507fa..5d7a53b 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -128,7 +128,7 @@
if (split.length!=basCrnpParam.getLocMastDemoCount()){
return R.error("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�").add("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�");
}
- basCrnpParam.setLocMastDemo(String.join(";", split));
+ basCrnpParam.setLocMastDemoList(new ArrayList<>(Arrays.asList(split)));
}
if (Cools.isEmpty(basCrnpParam.getStaOutDemo())){
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
index 4debdf4..6f07eac 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
@@ -112,11 +112,11 @@
// 鍙嚭
private String outEnable;
- private String hpMk;
+ private String hpMk = "N";
private String taskComplete = "鏃�";
private String errorCrn;
- private String demo;
- private Integer demoValue;
+ private String demo = "-";
+ private Integer demoValue = 0;
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
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 8da6e81..dd397d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2756,51 +2756,58 @@
* 婕旂ず妯″紡鍚姩
*/
public boolean crnStnDEMOOpen1() {
- int selectCount = taskWrkService.selectCount(new EntityWrapper<TaskWrk>());
- if (selectCount>0) {
- return false;
- }
- for (CrnSlave crn : slaveProperties.getCrn()) {
-
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
+ try{
+ int selectCount = taskWrkService.selectCount(new EntityWrapper<TaskWrk>());
+ if (selectCount>0) {
+ return false;
}
- BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
- if (basCrnp == null) {
- log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
- continue;
- }
-
- if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){
- CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "瀛樺湪鍏跺畠鍫嗗灈鏈哄紑鍚紨绀烘ā寮忥紒");
- continue;
- }
-
- CrnSlave crnSlave = new CrnSlave(crn);
- if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
- CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄贩閬撳彿寮傚父锛�");
- continue;
- }
-
- if (!crn.getId().equals(crnProtocol.getLaneNo())) {
- for (CrnSlave crnOther : slaveProperties.getCrn()) {
- if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
- crnSlave.updateCrnInStn(crnOther);
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ try{
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
}
- }
- }
- for (String locNo : crnProtocol.getLocMastDemoList()){
- LocMast locMast = locMastService.selectByLocNo(locNo);
- TaskCreateParam taskCreateParam = new TaskCreateParam(crnSlave,locMast);
- taskCreateParam.setStartPointSta(crnProtocol.getStaIntDemo());
- taskCreateParam.setTargetPointSta(crnProtocol.getStaOutDemo());
- openService.taskCreate(taskCreateParam);
- }
+ BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp == null) {
+ log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+ continue;
+ }
- return true;
+ if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){
+ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "瀛樺湪鍏跺畠鍫嗗灈鏈哄紑鍚紨绀烘ā寮忥紒");
+ continue;
+ }
+//
+ CrnSlave crnSlave = new CrnSlave(crn);
+ if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
+ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄贩閬撳彿寮傚父锛�");
+ continue;
+ }
+
+ if (!crn.getId().equals(crnProtocol.getLaneNo())) {
+ for (CrnSlave crnOther : slaveProperties.getCrn()) {
+ if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
+ crnSlave.updateCrnInStn(crnOther);
+ }
+ }
+ }
+ for (String locNo : crnProtocol.getLocMastDemoList()){
+ LocMast locMast = locMastService.selectByLocNo(locNo);
+ TaskCreateParam taskCreateParam = new TaskCreateParam(crnSlave,locMast);
+ taskCreateParam.setStartPointSta(crnProtocol.getStaIntDemo());
+ taskCreateParam.setTargetPointSta(crnProtocol.getStaOutDemo());
+ openService.taskCreate(taskCreateParam);
+ }
+ } catch (Exception e) {
+ CrnErrCache.updateCrnErr(crn.getId(), "婕旂ず妯″紡鐢熸垚浠诲姟寮傚父锛�");
+ continue;
+ }
+
+ return true;
+ }
+ } catch (Exception e) {
}
return false;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 240b7df..15990c7 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -29,7 +29,7 @@
/**
* =====>> 寮�濮嬪伐浣�
*/
- public void start(){
+ public void start() {
thread = new Thread(this::crnAndDevRun);
thread.start();
@@ -73,6 +73,7 @@
}
}
}
+
private void crnAndDevOtherRun() {
while (!Thread.currentThread().isInterrupted()) {
try {
@@ -136,35 +137,35 @@
Thread.sleep(1000);
// 绯荤粺婕旂ず妯″紡杩愯鐘舵�佸彉鍖�
if (SystemProperties.WCS_RUNNING_STATUS_DEMO.get()) {
- if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2){
+ if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2) {
boolean signHpMk = mainService.crnStnDEMOStop2();
- if (signHpMk){
+ if (signHpMk) {
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 3;
}
- } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3){
+ } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3) {
boolean signHpMk = mainService.crnStnDEMOStop3();
- if (signHpMk){
+ if (signHpMk) {
SystemProperties.WCS_RUNNING_STATUS_DEMO.set(false);
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
}
}
} else {
- if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1){
+ if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1) {
boolean signHpMk = mainService.crnStnDEMOOpen1();
- if (signHpMk){
+ if (signHpMk) {
SystemProperties.WCS_RUNNING_STATUS_DEMO.set(true);
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2;
} else {
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
}
} else {
- boolean signHpMk = mainService.crnStnDEMOOpen0();
- if (signHpMk){
- SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1;
- } else {
- SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
- }
- }
+ boolean signHpMk = mainService.crnStnDEMOOpen0();
+ if (signHpMk) {
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1;
+ } else {
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
+ }
+ }
}
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄦ樉绀烘椂闂�
} catch (Exception e) {
@@ -174,7 +175,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null) thread.interrupt();
if (thread2 != null) thread2.interrupt();
if (thread3 != null) thread3.interrupt();
--
Gitblit v1.9.1