From 2c9f8abab223d5aa163cae1d733f5ad7957a7b77 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期日, 12 四月 2026 18:04:36 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java | 4 +++-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java | 8 +++++---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java | 4 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java | 2 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java | 6 +++---
zy-asc-conveyor/src/main/resources/application.yml | 8 ++++----
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 1 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java | 3 +++
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 15 ++++++++++-----
10 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java
index 95e4a48..8ac8602 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/ApplyInDto.java
@@ -15,4 +15,7 @@
private Boolean full;
+ //閲嶉噺
+ private Double weight;
+
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
index 85791dd..6dbefe2 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
@@ -6,11 +6,13 @@
*/
public enum DeviceField {
// 鎵爜鍣細姣忕珯鐐�16瀛楄妭锛孲tring[14]
- BARCODE("DB101", 0, 16),
+ BARCODE("DB103", 254, 16),
// 绉伴噸锛氭瘡绔欑偣4瀛楄妭锛孎loat
- WEIGHT("DB102", 0, 4),
+ //WEIGHT("DB102", 0, 4),
+
+ WEIGHT("DB103", 634, 4),
// 灏哄寮傚父锛氭瘡绔欑偣2瀛楄妭锛孊it鏁扮粍
- DIMENSION_WORD("DB103", 0, 2);
+ DIMENSION_WORD("DB103", 2, 8);
private final String addressPattern;
private final int offset;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
index 2bf07fa..30070f8 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
@@ -5,7 +5,7 @@
* 绔欑偣鐘舵�佸瓧娈垫灇涓撅紙瀵瑰簲 搂2.1锛�
*/
public enum StationStatusField {
- ALL("DB100", 0, 12),
+ ALL("DB100", 10, 10),
TASK_NUMBER("DB100", 0, 4), // 浠诲姟鍙凤紝鍋忕Щ0锛�4瀛楄妭
FINAL_TARGET("DB100", 4, 2), // 鏈�缁堢洰鏍囩珯锛屽亸绉�4锛�2瀛楄妭
STATUS_WORD("DB100", 6, 2), // 鐘舵�佸瓧锛屽亸绉�6锛�2瀛楄妭
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java
index 803d308..44f104f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java
@@ -5,7 +5,7 @@
* 浠诲姟涓嬪彂瀛楁鏋氫妇锛堝搴� 搂2.4锛�
*/
public enum TaskField {
- ALL("DB13", 0, 12),
+ ALL("DB13", 48, 48),
TASK_NUMBER("DB13", 0, 4),
START_STATION("DB13", 4, 2),
DEST_STATION("DB13", 6, 2),
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
index 6510156..4b85714 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
@@ -3,12 +3,14 @@
import com.zy.acs.conveyor.entity.Devp;
import lombok.Data;
+import java.io.Serializable;
+
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
* Created by vincent on 2020/8/6
*/
@Data
-public class StaProtocol implements Cloneable {
+public class StaProtocol implements Cloneable, Serializable {
private Integer plcId;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index 8b32d3a..cbaa48a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -137,6 +137,7 @@
applyInDto.setStaNo(staNo);
applyInDto.setBarcode(barcode);
applyInDto.setFull(staProtocol.isFullPlt());
+ applyInDto.setWeight(staProtocol.getWeight());
return applyInDto;
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
index 5252eb7..bae6f06 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
@@ -62,7 +62,7 @@
return;
}
- int baseOffset = index * TaskField.ALL.getByteLength();
+ int baseOffset = TaskField.ALL.getOffset() + index * TaskField.ALL.getByteLength();
String workNoAddr = TaskField.TASK_NUMBER.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION
+ (baseOffset + TaskField.TASK_NUMBER.getOffset());
String destStaAddr = TaskField.DEST_STATION.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION
@@ -73,7 +73,7 @@
boolean success = false;
while (writeCount < WRITE_RETRY_MAX) {
- OperateResult writeResult = siemensS7Net.Write(workNoAddr, staProtocol.getWorkNo().shortValue());
+ OperateResult writeResult = siemensS7Net.Write(workNoAddr, staProtocol.getWorkNo());
Thread.sleep(WRITE_RETRY_INTERVAL_MS);
OperateResult writeResult1 = siemensS7Net.Write(destStaAddr, staProtocol.getStaNo().shortValue());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 370550e..301ae9e 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -109,7 +109,7 @@
byte[] content = result.Content;
for (int i = 0; i < staNoSize; i++) {
- StaProtocol staProtocol = station.get(staNos.get(staNoSize));
+ StaProtocol staProtocol = station.get(staNos.get(i));
parseStationStatus(content, i, staProtocol);
}
@@ -134,7 +134,7 @@
*/
private void parseStationStatus(byte[] content, int index, StaProtocol staProtocol) {
int offset = index * StationStatusField.ALL.getByteLength();
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(content, offset));
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(content, offset + StationStatusField.TASK_NUMBER.getOffset()));
staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(
content, offset + StationStatusField.FINAL_TARGET.getOffset()));
@@ -244,10 +244,15 @@
log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNosError.get(i));
continue;
}
-
+ short i1 = siemensS7Net.getByteTransform().TransInt16(
+ content, 0);
boolean[] status = siemensS7Net.getByteTransform().TransBool(
- content, i * DeviceField.DIMENSION_WORD.getByteLength(),
- DeviceField.DIMENSION_WORD.getByteLength());
+ content, 2+i * DeviceField.DIMENSION_WORD.getByteLength(),
+ 1);
+
+ boolean[] status1 = siemensS7Net.getByteTransform().TransBool(
+ content, 2+i * DeviceField.DIMENSION_WORD.getByteLength()+1,
+ 1);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java
index 3bf5896..aecbf5d 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java
@@ -108,13 +108,13 @@
log.info("鏈繑鍥炵珯鐐圭姸鎬侊細{}", staNo);
} else {
log.error("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛歿}锛屽搷搴斿唴瀹癸細{}", jsonObject.getInteger(code), response);
- throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
+ //throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
}
} catch (CoolException e) {
log.error("璋冪敤绔欑偣鐘舵�佹帴鍙ｅ紓甯�", e);
- throw e;
+ //throw e;
} catch (Exception e) {
- log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝绔欑偣缂栧彿锛歿}", staNo, e);
+ //log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝绔欑偣缂栧彿锛歿}", staNo, e);
}
return null;
}
diff --git a/zy-asc-conveyor/src/main/resources/application.yml b/zy-asc-conveyor/src/main/resources/application.yml
index 5f095f5..21eb956 100644
--- a/zy-asc-conveyor/src/main/resources/application.yml
+++ b/zy-asc-conveyor/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8877
servlet:
context-path: /cv
@@ -30,7 +30,7 @@
path: /stock/out/cv/logs
wms:
- url: 10.10.10.220:8081
+ url: 10.10.10.200:8081
apply: /rsf-open-api/rcs/api/open/location/allocate
ctu:
url: 10.10.10.200:8088
@@ -84,7 +84,7 @@
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.191
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
@@ -107,7 +107,7 @@
barcodeArr:
- 1010
weightArr:
- - 1010
+ - 1009
# ctu鏀捐揣绔欑偣
releaseSta[0]:
# 鏈珯鐐�
--
Gitblit v1.9.1