From e22c2893d3df0494b5603f67b61bfc54e83129ea Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 27 一月 2024 19:50:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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 b74f1e6..724a297 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -45,10 +45,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -2041,10 +2038,16 @@
public synchronized void autoEmptyOut() {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
List<Integer> list = new ArrayList<>();
- list.add(102);list.add(111);
+ list.add(101);list.add(112);
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(101,102);map.put(112,111);
for (Integer site:list){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no", map.get(site)));
+ if (!Cools.isEmpty(wrkMast)){
+ continue;
+ }
//濡傛灉绔欑偣鍙嚭绂佺敤锛屽垯涓嶇敓鎴愮┖鐩樺嚭搴撲换鍔�
StaProtocol staProtocol = devpThread.getStation().get(site);
if (staProtocol == null) {
@@ -2062,7 +2065,7 @@
return;
}
Short loctype1 = 1;
- if (site == 102){
+ if (site == 101){
loctype1 = 2;
}
LocTypeDto locTypeDto = new LocTypeDto(loctype1, (short) 1, (short) 1);
@@ -2076,8 +2079,8 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- JSONObject data = (JSONObject) jsonObject.get("data");
- News.info((String) data.get("msg"));
+ String data = jsonObject.get("data").toString();
+ News.info((String) jsonObject.get("msg")+","+data);
} else {
News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/auto/emptyOut/v1","", response);
}
@@ -2091,7 +2094,7 @@
}
public synchronized void autoEmptyIn() {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
List<Integer> list = new ArrayList<>();
list.add(153);list.add(157);
for (Integer site:list){
@@ -2174,15 +2177,18 @@
* */
public synchronized void refreshRgvMap() {
try{
- for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+ List<BasRgvMap> basRgvMaps = basRgvMapService.selectList(new EntityWrapper<>());
+ for (BasRgvMap rgvSlave:basRgvMaps) {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getRgvNo());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
continue;
+ }else {
+ rgvProtocol = rgvProtocol.clone();
}
- BasRgv basRgv = basRgvService.selectById(rgvSlave.getId());
+ BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
if (basRgv == null) {
- log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�2", rgvSlave.getId());
+ log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�2", rgvSlave.getRgvNo());
continue;
}
@@ -2217,6 +2223,8 @@
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
continue;
+ }else {
+ rgvProtocol = rgvProtocol.clone();
}
BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
if (basRgv == null) {
@@ -2306,6 +2314,8 @@
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
continue;
+ }else {
+ rgvProtocol = rgvProtocol.clone();
}
BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
if (basRgv == null) {
@@ -2505,6 +2515,8 @@
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
continue;
+ }else {
+ rgvProtocol = rgvProtocol.clone();
}
BasRgv basRgv = basRgvService.selectById(rgvSlave.getRgvNo());
if (basRgv == null) {
--
Gitblit v1.9.1