From 7dabb7c81d9360ef25e3d9f4a840e211affb219a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 08 九月 2025 10:33:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 56 insertions(+), 39 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 138e4e3..91ab467 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -750,6 +750,7 @@
if ((wrkMast.getIoType() != 12 && wrkMast.getIoType() < 100) || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
continue;
}
+
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -812,51 +813,63 @@
} else {
staProtocolIn = staProtocolIn.clone();
}
- StaProtocol staProtocolOut = devpThread.getStation().get(1015);
- if (staProtocolOut == null) {
- continue;
- } else {
- staProtocolOut = staProtocolOut.clone();
- }
- if(staProtocolOut.getWorkNo() != null &&staProtocolOut.getStaNo() == 4006){
- WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo());
- WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997);
- if(wrkMast == null){
+ int[] outStaNos = {1015, 2016};
+ for (int outStaNo : outStaNos) {
+ StaProtocol staProtocolOut = devpThread.getStation().get(outStaNo);// 鐩樼偣鍑哄簱琛旀帴绔欑偣锛堝彲鑳芥槸 1015锛屼篃鍙兘鏄� 2016锛�
+ if (staProtocolOut == null) {
continue;
+ } else {
+ staProtocolOut = staProtocolOut.clone();
}
- try {
- TransplantWork param = new TransplantWork();
- param.setWorkNo(wrkMastOut.getWrkNo());
- param.setBarcode(wrkMastOut.getBarcode());
- param.setSourceStaNo(1015);
- param.setStaNo(wrkMastOut.getStaNo());
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/auto/TransplantingIn/v1")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- staProtocolOut.setWorkNo(9997);
- devpThread.setPakMk(staProtocolOut.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolOut));
- if (!result) {
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
+ if (staProtocolOut.getWorkNo() != null && staProtocolOut.getStaNo() == 4006) {
+ WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo());
+ WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997);
+ if (wrkMastOut == null) {
+ continue;
}
+ if (wrkMast != null) {
+ News.info("宸插瓨鍦ㄦ枩琛椾换鍔★紝绛夊緟浠诲姟瀹屾垚");
+ continue;
+ }
+ try {
+ TransplantWork param = new TransplantWork();
+ param.setWorkNo(wrkMastOut.getWrkNo());
+ param.setBarcode(wrkMastOut.getBarcode());
+ param.setSourceStaNo(outStaNo);
+ param.setStaNo(wrkMastOut.getStaNo());
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/auto/TransplantingOut/v1")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ staProtocolOut.setWorkNo(9997);
+ devpThread.setPakMk(staProtocolOut.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolOut));
+
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
}
}
-
if(staProtocolIn.getWorkNo() != null &&staProtocolIn.getStaNo() != 4001){
WrkMast wrkMastIn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9996);
- if(wrkMast == null){
+ if(wrkMastIn == null){
+ continue;
+ }
+ if(wrkMast != null){
+ News.info("宸插瓨鍦ㄦ枩琛椾换鍔★紝绛夊緟浠诲姟瀹屾垚");
continue;
}
try {
@@ -867,7 +880,7 @@
param.setStaNo(wrkMastIn.getStaNo());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
- .setPath("/rpc/auto/TransplantingOut/v1")
+ .setPath("/rpc/auto/TransplantingIn/v1")
.setJson(JSON.toJSONString(param))
.build()
.doPost();
@@ -2699,7 +2712,9 @@
if (rgvProtocol.getStatusType() == RgvStatusType.IDLE &&
rgvProtocol.getModeType() == RgvModeType.AUTO
&& !rgvProtocol.isLoaded1ing() //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
- && (rgvProtocol.getTaskNo1()==0)
+ && rgvProtocol.getTaskNo1()==0
+ && !rgvProtocol.isLoaded2ing()
+ && rgvProtocol.getTaskNo2()==0
&&rgvThread.isPakMk()
) {
BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
@@ -2715,7 +2730,9 @@
if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE
&& rgvProtocolOther.getModeType() == RgvModeType.AUTO
&& !rgvProtocolOther.isLoaded1ing()
- && (rgvProtocolOther.getTaskNo1()==0)
+ && rgvProtocolOther.getTaskNo1()==0
+ && !rgvProtocolOther.isLoaded2ing()
+ && rgvProtocolOther.getTaskNo2()==0
&&rgvThreadOther.isPakMk()
){
//瀵瑰伐浣滄。杩涜鍒ゆ柇
@@ -3492,7 +3509,7 @@
// if (staNos.contains(wrkMastSta.getStaStart())) {//闈炲叆搴撳彛锛堝嚭搴撳彛锛夐檺鍒�
// continue;
// }
-// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
+// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta,null); //鍛戒护涓嬪彂
// wrkEnable = true;
// if (sign){
// wrkMastSta.setWrkSts(1);
--
Gitblit v1.9.1