From 153ab7259290179957c1cfa36b5c2e6b6da587c4 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期六, 23 八月 2025 15:29:52 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 ++++++++++++++++++-
src/main/java/com/zy/core/MainProcess.java | 2 +-
2 files changed, 19 insertions(+), 2 deletions(-)
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 57d3dda..84a094a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1554,7 +1554,9 @@
// 鍏ュ簱 + 搴撲綅杞Щ ==> 4.鍏ュ簱瀹屾垚
if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)) {
wrkMast.setWrkSts(4L);
- } else {
+ } else if (wrkMast.getIoType()==120 && wrkMast.getWrkSts()==2){
+ wrkMast.setWrkSts(5L);
+ }else {
continue;
}
Date now = new Date();
@@ -3242,6 +3244,21 @@
CrnSlave.CrnStn crnStn = crn.getCrnInStn().get(0);
News.info("鍫嗗灈鏈烘棤浠诲姟鑷姩鍥炲叆搴撳彛寰呮満==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満");
+ //鐢熸垚鍥炲師鐐瑰伐浣滄。 浣欏閿愰簰
+ WrkMast wrkMast=new WrkMast();
+ wrkMast.setWrkNo(9999);//宸ヤ綔鍙�
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L);//宸ヤ綔鐘舵��
+ wrkMast.setIoType(120);//浠诲姟绫诲瀷 120.鍫嗗灈鏈哄洖鍘熺偣
+ wrkMast.setIoPri(13.0);//浼樺厛绾�
+ wrkMast.setCrnNo(1);//鍫嗗灈鏈哄彿
+ wrkMast.setSourceStaNo(0);//婧愮珯
+ wrkMast.setStaNo(0);//鐩爣绔�
+ wrkMast.setSourceLocNo("");//婧愬簱浣�
+ wrkMast.setLocNo("");//鐩爣搴撲綅
+ if (wrkMastMapper.insert(wrkMast)==0){
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
// if (crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4){
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c506732..0e2471e 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -77,7 +77,7 @@
// News.info("杈撳叆鎴愬姛");
// }
//鍫嗗灈鏈烘棤浠诲姟鍥炲叆搴撳彛寰呮満
- mainService.crnMove();
+// mainService.crnMove();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
--
Gitblit v1.9.1