From 424c956abe6441e032b9e1e113b2f82a435fdc9b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 15 四月 2026 08:02:36 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/RedisConveyorConstant.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java | 1
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SafeSignalField.java | 4 +
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/operation/handler/SendTaskOperationHandler.java | 2
zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml | 3 -
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/StationStatusField.java | 4 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/TaskField.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 6 ++
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/PlcAlarmDefinition.java | 4 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java | 2
/dev/null | 18 ---------
zy-asc-conveyor/src/main/webapp/views/pipeline.html | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/DeviceField.java | 4 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/S7DevpThread.java | 6 +-
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 14 ++++++
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 1
17 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/RedisConveyorConstant.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/RedisConveyorConstant.java
index 9bdc336..ee84316 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/RedisConveyorConstant.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/RedisConveyorConstant.java
@@ -1,6 +1,6 @@
package com.zy.acs.conveyor.core.constant;
-public class RedisConveyorConstant {
+public interface RedisConveyorConstant {
//杈撻�佺嚎浠诲姟鏍囪瘑
public static final String CONVEYOR_TASK_FLAG = "CONVEYOR_TASK_FLAG";
//杈撻�佺嚎瀹夊叏浜や簰鏍囪瘑
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/enums/DeviceField.java
similarity index 93%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/DeviceField.java
index d06ae67..63603ed 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/enums/DeviceField.java
@@ -1,6 +1,8 @@
-package com.zy.acs.conveyor.core.constant;
+package com.zy.acs.conveyor.core.enums;
+import com.zy.acs.conveyor.core.constant.PlcConstant;
+
/**
* 璁惧瀛楁鏋氫妇锛堝搴� 搂2.2锛�
*/
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/PlcAlarmDefinition.java
similarity index 93%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/PlcAlarmDefinition.java
index 2817e65..787c431 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/PlcAlarmDefinition.java
@@ -1,4 +1,6 @@
-package com.zy.acs.conveyor.core.constant;
+package com.zy.acs.conveyor.core.enums;
+
+import com.zy.acs.conveyor.core.constant.PlcConstant;
/**
* PLC 鎶ヨ瀹氫箟锛堝搴� 搂2.3锛�
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/SafeSignalField.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SafeSignalField.java
similarity index 91%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/SafeSignalField.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SafeSignalField.java
index b8c5c9e..917ae77 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/SafeSignalField.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SafeSignalField.java
@@ -1,4 +1,6 @@
-package com.zy.acs.conveyor.core.constant;
+package com.zy.acs.conveyor.core.enums;
+
+import com.zy.acs.conveyor.core.constant.PlcConstant;
public enum SafeSignalField {
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SlaveType.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SlaveType.java
deleted file mode 100644
index 58e0d8c..0000000
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SlaveType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zy.acs.conveyor.core.enums;
-
-public enum SlaveType {
-
- Devp,
- Barcode,
- Scale,
- ;
-
- public static SlaveType findInstance(String s) {
- for (SlaveType type : SlaveType.values()) {
- if (type.toString().equals(s)) {
- return type;
- }
- }
- return null;
- }
-}
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/enums/StationStatusField.java
similarity index 92%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/StationStatusField.java
index 30070f8..3e444a4 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/enums/StationStatusField.java
@@ -1,6 +1,8 @@
-package com.zy.acs.conveyor.core.constant;
+package com.zy.acs.conveyor.core.enums;
+import com.zy.acs.conveyor.core.constant.PlcConstant;
+
/**
* 绔欑偣鐘舵�佸瓧娈垫灇涓撅紙瀵瑰簲 搂2.1锛�
*/
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/enums/TaskField.java
similarity index 96%
rename from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java
rename to zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/TaskField.java
index bf5a8b9..0429094 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/enums/TaskField.java
@@ -1,4 +1,4 @@
-package com.zy.acs.conveyor.core.constant;
+package com.zy.acs.conveyor.core.enums;
/**
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java
index efcd1c4..73db15f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java
@@ -10,7 +10,7 @@
private Integer index;
//鏄啓0杩樻槸1
private Boolean value;
- //浠ｈ〃鍐欏湪浜や簰1杩樻槸2
+ //浠ｈ〃鍐欏湪浜や簰1杩樻槸浜や簰2
private Boolean flag;
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 8685168..15345a8 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
@@ -89,6 +89,18 @@
News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
continue;
}
+ if (staProtocol.isWeightErr()){
+ News.error("{}锛氱珯鐐癸細{}锛岄噸閲忓紓甯革細{}", config.getMark(), staProtocol.getSiteId(), staProtocol.getWeight());
+ continue;
+ }
+ if (staProtocol.isBarcodeErr()){
+ News.error("{}锛氱珯鐐癸細{}锛屾潯鐮佸紓甯革細{}", config.getMark(),staProtocol.getSiteId(), staProtocol.getBarcode());
+ continue;
+ }
+ if (staProtocol.isLoadErr()){
+ News.error("{}锛氱珯鐐癸細{}锛屽叆搴撴椂妫�娴嬫墭鐩樹笂鏈夋棤璐х墿", config.getMark(),staProtocol.getSiteId());
+ continue;
+ }
String barcode = staProtocol.getBarcode();
if (Cools.isEmpty(barcode)) {
News.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
@@ -114,7 +126,7 @@
staProtocol.setStaNo(inSta.getTargetSta());
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
job.setLoc(locOfWms.getLocNo());
- job.setStaNo(String.valueOf(inSta.getTargetSta()+1));
+ job.setStaNo(String.valueOf(inSta.getTargetSta() + 1));
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
job.setBarcode(barcode);
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
index 000c699..53e4170 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
@@ -74,7 +74,7 @@
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
- if (!staProtocol.isAutoing() ||staProtocol.getWorkNo() ==0) {
+ if (!staProtocol.isAutoing() || staProtocol.getWorkNo() == 0) {
//News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
continue;
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
index d3a07e3..a25342a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
@@ -1,6 +1,5 @@
package com.zy.acs.conveyor.core.operation.handler;
-import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
index 35b604a..9b5d47a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
@@ -38,6 +38,7 @@
private Integer sourceStaNo;
+
private Integer staNo;
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 6e9f1d4..402f87d 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
@@ -5,8 +5,8 @@
import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.constant.PlcConstant;
-import com.zy.acs.conveyor.core.constant.SafeSignalField;
-import com.zy.acs.conveyor.core.constant.TaskField;
+import com.zy.acs.conveyor.core.enums.SafeSignalField;
+import com.zy.acs.conveyor.core.enums.TaskField;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/S7DevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/S7DevpThread.java
index 3aed2d0..af9185a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/S7DevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/S7DevpThread.java
@@ -7,10 +7,10 @@
//import com.zy.acs.common.utils.News;
//import com.zy.acs.conveyor.core.DevpThread;
//import com.zy.acs.conveyor.core.cache.SlaveConnection;
-//import com.zy.acs.conveyor.core.constant.DeviceField;
+//import com.zy.acs.conveyor.core.enums.DeviceField;
//import com.zy.acs.conveyor.core.constant.PlcConstant;
-//import com.zy.acs.conveyor.core.constant.StationStatusField;
-//import com.zy.acs.conveyor.core.constant.TaskField;
+//import com.zy.acs.conveyor.core.enums.StationStatusField;
+//import com.zy.acs.conveyor.core.enums.TaskField;
//import com.zy.acs.conveyor.core.enums.SlaveType;
//import com.zy.acs.conveyor.core.model.StaProtocol;
//import com.zy.acs.conveyor.core.properties.DevpSlave;
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 873297c..cd5153c 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
@@ -5,6 +5,10 @@
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.*;
+import com.zy.acs.conveyor.core.enums.DeviceField;
+import com.zy.acs.conveyor.core.enums.PlcAlarmDefinition;
+import com.zy.acs.conveyor.core.enums.SafeSignalField;
+import com.zy.acs.conveyor.core.enums.StationStatusField;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
@@ -204,7 +208,7 @@
content, seg[0] + i * DeviceField.BARCODE.getByteLength());
String barcode = siemensS7Net.getByteTransform().TransString(
content, seg[1] + i * DeviceField.BARCODE.getByteLength(),
- DeviceField.BARCODE.getByteLength()-seg[1] , "UTF-8").trim();
+ DeviceField.BARCODE.getByteLength() - seg[1], "UTF-8").trim();
if (!Cools.isEmpty(barcode) && !barcode.contains("Default") && !barcode.contains("Error") && staNo != 0) {
StaProtocol staProtocol = station.get(staNo);
diff --git a/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml b/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml
index 3981183..c307281 100644
--- a/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml
+++ b/zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml
@@ -82,8 +82,7 @@
<select id="listJobByDay" resultMap="BaseResultMap">
select *
from cv_job
- where
- DATEDIFF(NOW(), create_time) > #{day}
+ where DATEDIFF(NOW(), create_time) > #{day}
</select>
diff --git a/zy-asc-conveyor/src/main/webapp/views/pipeline.html b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
index ef16ef9..e3c466b 100644
--- a/zy-asc-conveyor/src/main/webapp/views/pipeline.html
+++ b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
@@ -788,7 +788,7 @@
<th>鐩爣绔�</th>
<th>鏉＄爜</th>
<th>瀹夊叏淇″彿</th>
-<!-- <th>楂樹綆淇″彿</th>-->
+ <!-- <th>楂樹綆淇″彿</th>-->
</tr>
</thead>
<tbody>
--
Gitblit v1.9.1