From fd69e79dd9861681e31893d7941b39571f49dca4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 15 十二月 2023 16:24:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 40ca887..0fb2f7d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -179,7 +179,6 @@
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
- param.setFull(staProtocol.isFull());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -2215,12 +2214,11 @@
* 鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
*/
public synchronized void autoEmptyIn() {
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- // 閬嶅巻绌烘澘鍏ュ簱鍙�
- for (CrnSlave.CrnStn emptyInStn : crnSlave.getEmptyCrnInStn()) {
+ for (DevpSlave slave : slaveProperties.getDevp()) {
+ for (DevpSlave.Sta sta : slave.getAutoEmptyIn()) {
// 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, emptyInStn.getDevpPlcId());
- StaProtocol staProtocol = devpThread.getStation().get(emptyInStn.getStaNo());
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, slave.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(sta.getStaNo());
if (staProtocol == null) {
continue;
} else {
@@ -2236,7 +2234,7 @@
SearchLocParam param = new SearchLocParam();
param.setIoType(10);
- param.setSourceStaNo(emptyInStn.getStaNo());
+ param.setSourceStaNo(sta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
@@ -2263,7 +2261,6 @@
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
-
}
}
}
@@ -2273,10 +2270,10 @@
* 鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
*/
public synchronized void autoEmptyOut() {
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- for (CrnSlave.CrnStn emptyOutStn : crnSlave.getEmptyCrnOutStn()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, emptyOutStn.getDevpPlcId());
- StaProtocol staProtocol = devpThread.getStation().get(emptyOutStn.getStaNo());
+ for (DevpSlave slave : slaveProperties.getDevp()) {
+ for (DevpSlave.Sta sta : slave.getAutoEmptyOut()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, slave.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(sta.getStaNo());
if (staProtocol == null) {
return;
} else {
@@ -2285,16 +2282,16 @@
if (staProtocol.isAutoing() //鑷姩
&& !staProtocol.isLoading() //鏃犵墿
- && staProtocol.isOutEnable() //鍙嚭淇″彿
+ && staProtocol.isEmptyPalletRequire() //绌烘墭鐩橀渶姹備俊鍙�
&& staProtocol.getWorkNo() == 0
) {
- WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(emptyOutStn.getStaNo());
+ WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(sta.getStaNo());
if (null != pakoutEmpty) {
return;
}
try {
HashMap<String, Object> map = new HashMap<>();
- map.put("crnNo", crnSlave.getId());
+ map.put("staNo", sta.getStaNo());//鐩爣绔�
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setParams(map)
@@ -2314,6 +2311,7 @@
}
}
}
+
}
}
--
Gitblit v1.9.1