From 96bb13d8410b5fef19154bf314b988fd67a98816 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 17 十一月 2025 13:41:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 103 ++++++++++++++++++++++++----------
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 +++++-
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 1
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 1
src/main/resources/application.yml | 11 ++-
6 files changed, 104 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 46d24ad..d74b0e6 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -198,73 +198,114 @@
public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry){
List<PlcErrorTableVo> list = new ArrayList<>();
StaProtocol staProtocol = entry.getValue();
- if (staProtocol.getBreakerErr()){
+ if (staProtocol.getPassTimeOut()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鏂矾鍣ㄦ晠闅�");
- vo.setError("鏂矾鍣ㄦ晠闅�");
+ vo.setPlcDesc("鐗╀綋杩涘嚭瓒呮椂");
+ vo.setError("鐗╀綋杩涘嚭瓒呮椂");
list.add(vo);
}
- if (staProtocol.getInfraredErr()){
+ if (staProtocol.getObjectNoIdError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍏夌數寮傚父");
- vo.setError("鍏夌數寮傚父");
+ vo.setPlcDesc("鏈夌墿浣撴棤鏁版嵁");
+ vo.setError("鏈夌墿浣撴棤鏁版嵁");
list.add(vo);
}
- if (staProtocol.getOutTimeErr()){
+ if (staProtocol.getIdNoObjectError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("杩愯瓒呮椂");
- vo.setError("杩愯瓒呮椂");
+ vo.setPlcDesc("鏈夋暟鎹棤鐗╀綋");
+ vo.setError("鏈夋暟鎹棤鐗╀綋");
list.add(vo);
}
- if (staProtocol.getSeizeSeatErr()){
+ if (staProtocol.getLmfrError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍗犱綅瓒呮椂");
- vo.setError("鍗犱綅瓒呮椂");
+ vo.setPlcDesc("绾夸綋鐢垫満鐑户鎶ヨ");
+ vo.setError("绾夸綋鐢垫満鐑户鎶ヨ");
list.add(vo);
}
- if (staProtocol.getWrkYgoodsN()){
+ if (staProtocol.getLiftError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鏈変换鍔℃棤璐ф晠闅�");
- vo.setError("鏈変换鍔℃棤璐ф晠闅�");
+ vo.setPlcDesc("椤跺崌鎶ヨ");
+ vo.setError("椤跺崌鎶ヨ");
list.add(vo);
}
- if (staProtocol.getInverterErr()){
+ if (staProtocol.getDlfrError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍙橀鍣ㄦ晠闅�");
- vo.setError("鍙橀鍣ㄦ晠闅�");
+ vo.setPlcDesc("椤跺崌鐢垫満鐑户鎶ヨ");
+ vo.setError("椤跺崌鐢垫満鐑户鎶ヨ");
list.add(vo);
}
- if (staProtocol.getContactErr()){
+ if (staProtocol.getDmfrError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- vo.setError("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ vo.setPlcDesc("椤跺崌妯Щ鐢垫満鐑户鎶ヨ");
+ vo.setError("椤跺崌妯Щ鐢垫満鐑户鎶ヨ");
list.add(vo);
}
- if (staProtocol.getUpcontactErr()){
+ if (staProtocol.getVfdError()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- /*
- * 瀹滅瀹氬埗 150绔欑偣寮傚父淇℃伅锛氬ぇ鎵樼洏鐩殑绔欓敊璇�
- * */
- if (entry.getKey()==150){
- vo.setPlcDesc("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
- vo.setError("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
- }
+ vo.setPlcDesc("鍙橀鏁呴殰");
+ vo.setError("鍙橀鏁呴殰");
+ list.add(vo);
+ }
+ if (staProtocol.getSrvError()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("浼烘湇鏁呴殰");
+ vo.setError("浼烘湇鏁呴殰");
+ list.add(vo);
+ }
+ if (staProtocol.getCommunicationTimeOut()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("涓庝笂浣嶆満閫氳瓒呮椂");
+ vo.setError("涓庝笂浣嶆満閫氳瓒呮椂");
+ list.add(vo);
+ }
+ if (staProtocol.getParameterIncompleteError()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("淇℃伅鍙傛暟涓嶅叏");
+ vo.setError("淇℃伅鍙傛暟涓嶅叏");
+ list.add(vo);
+ }
+ if (staProtocol.getDataNotClear()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("淇℃伅鏁版嵁鏈竻闄�");
+ vo.setError("淇℃伅鏁版嵁鏈竻闄�");
+ list.add(vo);
+ }
+ if (staProtocol.getSetParameterError()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鍙傛暟璁剧疆鎶ヨ");
+ vo.setError("鍙傛暟璁剧疆鎶ヨ");
+ list.add(vo);
+ }
+ if (staProtocol.getDataError()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc("鏁版嵁閿欒");
+ vo.setError("鏁版嵁閿欒");
list.add(vo);
}
if (staProtocol.isFrontErr()){
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 412410d..69c5cfe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2029,7 +2029,7 @@
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
BasErrLog basErrLog = new BasErrLog(
- null, // 缂栧彿
+ crnProtocol.getUuid(), // 缂栧彿
wrkMast.getWrkNo(), // 宸ヤ綔鍙�
now, // 鍙戠敓鏃堕棿
null, // 缁撴潫鏃堕棿
@@ -2077,7 +2077,7 @@
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
BasErrLog basErrLog = new BasErrLog(
- null, // 缂栧彿
+ crnProtocol.getUuid(), // 缂栧彿
null, // 宸ヤ綔鍙�
now, // 鍙戠敓鏃堕棿
null, // 缁撴潫鏃堕棿
@@ -3302,6 +3302,9 @@
// 鑾峰彇RGV淇℃伅
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
+ continue;
+ }
if (rgvProtocol.getStatusType1() != RgvStatusType.IDLE && rgvProtocol.getModeType() != RgvModeType.AUTO) {
continue;
}
@@ -3518,6 +3521,7 @@
basRgv.setPakAll("1");
basRgvService.updateById(basRgv);
rgvThread.setPakMk(true);
+
}
// List<WrkMastSta> wrkMastStaPakingNum = wrkMastStaService.selectPakingWrkNum(basRgv.getRgvNo());
// if(wrkMastStaPakingNum.size() <1){
@@ -3537,6 +3541,7 @@
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+
if (rgvProtocol == null) {
continue;
}
@@ -3547,6 +3552,8 @@
continue;
}
if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
+ rgvThread.setPaking(true);
+ }else if(rgvProtocol.getTaskNo1() == 0 && rgvProtocol.getTaskNo2() == 0 && rgvProtocol.getStatusType1() == RgvStatusType.IDLE){
rgvThread.setPaking(true);
}
if(rgvProtocol.isLoaded1ing() && rgvProtocol.isLoaded2ing()){
@@ -3704,7 +3711,7 @@
if(wrkMastSta3 != null ){
List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
- if(wrkMastStaPaking.size() < 1 ){//宸叉湁鏍囪涓嶅啀鏍囪
+ if(wrkMastStaPaking.size() < 1 && !wrkMastSta3.getWrkNo().equals(wrkMastSta.getWrkNo())){//宸叉湁鏍囪涓嶅啀鏍囪
wrkMastSta3.setMk(1);
basRgv.setPakAll("0");
basRgvService.updateById(basRgv);
@@ -3836,8 +3843,13 @@
wrkMastSta.setWorkSta(wrkMastSta1 !=null ? 2 : 1);//鑻�1鍙峰伐浣嶆湁浠诲姟缁�2鍙峰伐浣�
wrkMastSta.setRgvNo((int) rgvProtocol.getRgvNo());
boolean sign = false;
+
sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
if (sign){
+ if(wrkMastSta.getMk() == 1){//鑻ュ凡鎵ц
+ basRgv.setPakAll("1");
+ basRgvService.updateById(basRgv);
+ }
if(LEFT_POSITION.contains(wrkMastSta.getStaEnd())){
basRgv.setPakToCrn("0");
basRgvService.updateById(basRgv);
@@ -3847,7 +3859,7 @@
}
}
}
- if(wrkMastSta3 != null ){
+ if(wrkMastSta3 != null && !wrkMastSta3.getWrkNo().equals(wrkMastSta.getWrkNo())){
List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
if(wrkMastStaPaking.size() < 1){
wrkMastSta3.setMk(1);
@@ -3855,7 +3867,7 @@
basRgvService.updateById(basRgv);
try{
wrkMastStaMapper.updateById(wrkMastSta3);
- log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟:"+ wrkMastSta3.getWrkNo());
}catch (Exception e){
log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 623e52c..f57eba9 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -189,6 +189,7 @@
public Float yDuration;
//鍫嗗灈鏈洪厤缃俊鍙�--------------------------------------------------------------
+ private String uuid;
// 鏁呴殰璇诲彇閿佸畾鏍囪
private boolean errorMk = false;
//鍐欏叆鏍囪
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 0f8b410..25658d8 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -53,6 +53,8 @@
*/
private boolean backHpFlag = false;
+ private Integer errId = 0;
+
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -289,7 +291,9 @@
BasCrnErrorLog basCrnErrorLogs;
basCrnErrorLogs = crnProtocol.toSqlModelError();
BasCrnErrorLogService basCrnErrorLogService = SpringUtils.getBean(BasCrnErrorLogService.class);
- basCrnErrorLogService.insert(basCrnErrorLogs);
+ if(basCrnErrorLogService.insert(basCrnErrorLogs)){
+ crnProtocol.setUuid(basCrnErrorLogs.getId().toString());
+ }
crnProtocol.setWriteMk(false);
} catch (Exception ignore) {
log.error(ignore.getMessage());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 30b1455..b24cb6d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -283,6 +283,7 @@
read();
} catch (Exception e) {
+ e.printStackTrace();
log.error("Dev鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initSite();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 37ff093..231a8a2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -477,12 +477,10 @@
# barcodeMat: ${wcs-slave.barcode[5].id}
# backSta: 160
# led: ${wcs-slave.led[5].id}
-
# 鍑哄簱鍙�1
outSta[0]:
staNo: 1041
led: ${wcs-slave.led[0].id}
-
outStaAgvFull[0]:
staNo: 1041
led: ${wcs-slave.led[0].id}
@@ -638,4 +636,11 @@
ip: 10.10.10.218
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 4006
\ No newline at end of file
+ staArr: 4006
+ # LED7
+ led[7]:
+ id: 8
+ ip: 10.10.10.219
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1041
\ No newline at end of file
--
Gitblit v1.9.1