From 88fdf1ab75fd6cddfbc032a7e05ae9fe4639a361 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 07 四月 2026 15:57:23 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java | 10
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcConstant.java | 6
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/utils/Utils.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WrkLastnoServiceImpl.java | 4
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java | 7
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 34 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java | 7
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/BarcodeThread.java | 4
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java | 6
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java | 6
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java | 42 +++---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java | 4
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/DevpServiceImpl.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 16 +-
zy-asc-conveyor/pom.xml | 142 +++++++++++-----------
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java | 4
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/cache/MessageQueue.java | 1
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java | 9
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 24 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/S7DevpThread.java | 2
zy-asc-conveyor/src/main/resources/application.yml | 16 +-
25 files changed, 178 insertions(+), 178 deletions(-)
diff --git a/zy-asc-conveyor/pom.xml b/zy-asc-conveyor/pom.xml
index c8373e3..d8e015c 100644
--- a/zy-asc-conveyor/pom.xml
+++ b/zy-asc-conveyor/pom.xml
@@ -24,78 +24,78 @@
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>org.springframework.boot</groupId>-->
- <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.zy</groupId>
- <artifactId>acs-common</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-driver.version}</version>
- </dependency>
- <!-- <dependency>-->
- <!-- <groupId>com.microsoft.sqlserver</groupId>-->
- <!-- <artifactId>mssql-jdbc</artifactId>-->
- <!-- <version>8.2.2.jre8</version>-->
- <!-- </dependency>-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.boot</groupId>-->
+ <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.zy</groupId>
+ <artifactId>acs-common</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql-driver.version}</version>
+ </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>com.microsoft.sqlserver</groupId>-->
+ <!-- <artifactId>mssql-jdbc</artifactId>-->
+ <!-- <version>8.2.2.jre8</version>-->
+ <!-- </dependency>-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
- <!-- swagger -->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>core</artifactId>
- <version>3.3.0</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>easyexcel</artifactId>
- <version>2.0.5</version>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.20</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.github.dathlin</groupId>
- <artifactId>HslCommunication</artifactId>
- <version>2.0.0</version>
- </dependency>
- <!-- okHttp3 -->
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>3.10.0</version>
- </dependency>
+ <!-- swagger -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.20</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.dathlin</groupId>
+ <artifactId>HslCommunication</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <!-- okHttp3 -->
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
+ </dependency>
<dependency>
<groupId>com.github.xingshuangs</groupId>
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
index 06f79be..2f201f2 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
@@ -3,13 +3,13 @@
import com.zy.acs.conveyor.common.web.BaseController;
import com.zy.acs.conveyor.controller.requestParam.StationRequestParam;
import com.zy.acs.conveyor.controller.responseParam.StationResponseParam;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.R;
import com.zy.acs.conveyor.core.DevpThread;
import com.zy.acs.conveyor.core.cache.SlaveConnection;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
index 5c0b8f6..c609673 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
@@ -2,20 +2,20 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.acs.conveyor.controller.vo.SiteTableVo;
-import com.zy.acs.conveyor.entity.Devp;
-import com.zy.acs.conveyor.service.DevpService;
-import com.zy.acs.framework.annotations.ManagerAuth;
-import com.zy.acs.framework.common.R;
import com.zy.acs.conveyor.core.DevpThread;
import com.zy.acs.conveyor.core.cache.MessageQueue;
import com.zy.acs.conveyor.core.cache.OutputQueue;
import com.zy.acs.conveyor.core.cache.SlaveConnection;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.model.Task;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.conveyor.entity.Devp;
+import com.zy.acs.conveyor.service.DevpService;
+import com.zy.acs.framework.annotations.ManagerAuth;
+import com.zy.acs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
index 72f5a46..6a4b32d 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
@@ -4,13 +4,13 @@
import com.zy.acs.conveyor.controller.requestParam.StaParam;
import com.zy.acs.conveyor.controller.responseParam.StationResponseParam;
import com.zy.acs.conveyor.controller.vo.PlcErrorTableVo;
-import com.zy.acs.conveyor.entity.Job;
-import com.zy.acs.conveyor.service.JobService;
-import com.zy.acs.framework.common.R;
import com.zy.acs.conveyor.core.DevpThread;
import com.zy.acs.conveyor.core.cache.SlaveConnection;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.entity.Job;
+import com.zy.acs.conveyor.service.JobService;
+import com.zy.acs.framework.common.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/cache/MessageQueue.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/cache/MessageQueue.java
index dfdcf29..7b8e992 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/cache/MessageQueue.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/cache/MessageQueue.java
@@ -7,7 +7,6 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.LinkedBlockingQueue;
/**
* 娑堟伅闃熷垪
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 3039913..c63c92e 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
@@ -8,7 +8,7 @@
// 鎵爜鍣細姣忕珯鐐�16瀛楄妭锛孲tring[14]
BARCODE("DB101", 0, 16),
// 绉伴噸锛氭瘡绔欑偣4瀛楄妭锛孎loat
- WEIGHT("DB102", 0, 4),
+ WEIGHT("DB102", 0, 4),
// 灏哄寮傚父锛氭瘡绔欑偣2瀛楄妭锛孊it鏁扮粍
DIMENSION_WORD("DB103", 0, 2);
@@ -16,7 +16,7 @@
private final int offset;
private final int byteLength;
- DeviceField(String addressPattern, int offset, int byteLength) {
+ DeviceField(String addressPattern, int offset, int byteLength) {
this.addressPattern = addressPattern;
this.offset = offset;
this.byteLength = byteLength;
@@ -36,7 +36,8 @@
/**
* 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
- * @param dbBlock DB鍧楃紪鍙�
+ *
+ * @param dbBlock DB鍧楃紪鍙�
* @param stationBaseOffset 绔欑偣鍩哄潃鍋忕Щ锛堢珯鐐瑰彿*绔欑偣闀垮害锛�
* @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
*/
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/constant/PlcAlarmDefinition.java
index 78728db..74c0ae8 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/constant/PlcAlarmDefinition.java
@@ -1,26 +1,26 @@
package com.zy.acs.conveyor.core.constant;
- /**
- * PLC 鎶ヨ瀹氫箟锛堝搴� 搂2.3锛�
- */
- public enum PlcAlarmDefinition {
- EMERGENCY_STOP("DB25",1, "鎬ュ仠"),
- LOWER_BREAKER_TRIP("DB25",2, "浣庝綅鏂矾鍣ㄦ柇寮�"),
- LOWER_INVERTER_FAULT("DB25",3, "浣庝綅鍙橀鍣ㄦ晠闅�"),
- CONVEYOR_TIMEOUT("DB25",4, "杈撻�佽繍琛岃秴鏃�"),
- LIFT_TIMEOUT("DB25",5, "椤跺崌杩愯瓒呮椂"),
- TASK_REQUEST_TIMEOUT("DB25",6, "鐢宠浠诲姟瓒呮椂"),
- PALLET_PROTRUSION("DB25",7, "鎵樼洏绐佸嚭鎶ヨ"),
- TASK_DUPLICATE("DB25",8, "浠诲姟閲嶅鎶ヨ"),
- PRECONDITION_ERROR("DB25",9, "鍏ョ珯杩囩▼涓墠缃潯浠跺紓甯�");
+/**
+ * PLC 鎶ヨ瀹氫箟锛堝搴� 搂2.3锛�
+ */
+public enum PlcAlarmDefinition {
+ EMERGENCY_STOP("DB25", 1, "鎬ュ仠"),
+ LOWER_BREAKER_TRIP("DB25", 2, "浣庝綅鏂矾鍣ㄦ柇寮�"),
+ LOWER_INVERTER_FAULT("DB25", 3, "浣庝綅鍙橀鍣ㄦ晠闅�"),
+ CONVEYOR_TIMEOUT("DB25", 4, "杈撻�佽繍琛岃秴鏃�"),
+ LIFT_TIMEOUT("DB25", 5, "椤跺崌杩愯瓒呮椂"),
+ TASK_REQUEST_TIMEOUT("DB25", 6, "鐢宠浠诲姟瓒呮椂"),
+ PALLET_PROTRUSION("DB25", 7, "鎵樼洏绐佸嚭鎶ヨ"),
+ TASK_DUPLICATE("DB25", 8, "浠诲姟閲嶅鎶ヨ"),
+ PRECONDITION_ERROR("DB25", 9, "鍏ョ珯杩囩▼涓墠缃潯浠跺紓甯�");
- private final String addressPattern;
- private final int index; // 鎶ヨ搴忓彿锛�1-based锛�
- private final String description;
+ private final String addressPattern;
+ private final int index; // 鎶ヨ搴忓彿锛�1-based锛�
+ private final String description;
- PlcAlarmDefinition(String addressPattern,int index, String description) {
- this.addressPattern = addressPattern;
- this.index = index;
- this.description = description;
- }
+ PlcAlarmDefinition(String addressPattern, int index, String description) {
+ this.addressPattern = addressPattern;
+ this.index = index;
+ this.description = description;
}
+}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcConstant.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcConstant.java
index fffb9e7..5190a1d 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcConstant.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcConstant.java
@@ -3,11 +3,11 @@
public interface PlcConstant {
- public static final Integer STATION_STATUS_LENGTH =10;
+ public static final Integer STATION_STATUS_LENGTH = 10;
- public static final String ADDRESS_CONCATENATION =".";
+ public static final String ADDRESS_CONCATENATION = ".";
- public static final Integer TASK_LENGTH =12;
+ public static final Integer TASK_LENGTH = 12;
}
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 4953878..ec22048 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
@@ -6,9 +6,9 @@
*/
public enum StationStatusField {
TASK_NUMBER("DB100", 0, 4), // 浠诲姟鍙凤紝鍋忕Щ0锛�4瀛楄妭
- FINAL_TARGET("DB100", 4, 2), // 鏈�缁堢洰鏍囩珯锛屽亸绉�4锛�2瀛楄妭
+ FINAL_TARGET("DB100", 4, 2), // 鏈�缁堢洰鏍囩珯锛屽亸绉�4锛�2瀛楄妭
STATUS_WORD("DB100", 6, 2), // 鐘舵�佸瓧锛屽亸绉�6锛�2瀛楄妭
- TASK_WRITABLE("DB100", 8, 2); // 浠诲姟鍙啓鍖猴紝鍋忕Щ8锛�2瀛楄妭
+ TASK_WRITABLE("DB100", 8, 2); // 浠诲姟鍙啓鍖猴紝鍋忕Щ8锛�2瀛楄妭
private final String addressPattern;
private final int offset;
@@ -22,7 +22,8 @@
/**
* 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
- * @param dbBlock DB鍧楃紪鍙�
+ *
+ * @param dbBlock DB鍧楃紪鍙�
* @param stationBaseOffset 绔欑偣鍩哄潃鍋忕Щ锛堢珯鐐瑰彿*绔欑偣闀垮害锛�
* @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
*/
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 859e317..27ffa75 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
@@ -6,16 +6,16 @@
*/
public enum TaskField {
TASK_NUMBER("DB13", 0, 4),
- START_STATION("DB13", 4, 2),
+ START_STATION("DB13", 4, 2),
DEST_STATION("DB13", 6, 2),
- DIRECTION("DB13", 8, 1),
+ DIRECTION("DB13", 8, 1),
ROUTE_NUMBER("DB13", 10, 2);
private final String addressPattern;
private final int offset;
private final int byteLength;
- TaskField(String addressPattern, int offset, int byteLength) {
+ TaskField(String addressPattern, int offset, int byteLength) {
this.addressPattern = addressPattern;
this.offset = offset;
this.byteLength = byteLength;
@@ -35,7 +35,8 @@
/**
* 鏍规嵁 DB 鍧楃紪鍙峰拰绔欑偣鍋忕Щ鐢熸垚鍏蜂綋鍦板潃
- * @param dbBlock DB鍧楃紪鍙�
+ *
+ * @param dbBlock DB鍧楃紪鍙�
* @param stationBaseOffset 绔欑偣鍩哄潃鍋忕Щ锛堢珯鐐瑰彿*绔欑偣闀垮害锛�
* @return PLC4X 鍦板潃瀛楃涓诧紝濡� "DB100.DBD0"
*/
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 2cb91a4..973dc7a 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
@@ -2,6 +2,19 @@
import com.zy.acs.conveyor.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
+import com.zy.acs.conveyor.core.cache.MessageQueue;
+import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.conveyor.core.enums.ConveyorStateType;
+import com.zy.acs.conveyor.core.enums.SlaveType;
+import com.zy.acs.conveyor.core.enums.TaskType;
+import com.zy.acs.conveyor.core.model.Task;
+import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.operation.OperationHandler;
+import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
+import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.conveyor.core.thread.BarcodeThread;
+import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.JobService;
@@ -9,19 +22,6 @@
import com.zy.acs.conveyor.service.WrkLastnoService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
-import com.zy.acs.conveyor.core.enums.ConveyorStateType;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
-import com.zy.acs.conveyor.core.model.Task;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
-import com.zy.acs.conveyor.core.operation.OperationHandler;
-import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
-import com.zy.acs.conveyor.core.properties.SlaveProperties;
-import com.zy.acs.conveyor.core.thread.BarcodeThread;
-import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -85,7 +85,7 @@
}
// 9991鏄┖鏉匡紝9992鏄弧鏉�
if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
- Job job = jobService.getJobByBarcode(barcode ,ConveyorStateType.INBOUND.getStatus());
+ Job job = jobService.getJobByBarcode(barcode, ConveyorStateType.INBOUND.getStatus());
// 鐢宠鍏ュ簱
if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
@@ -94,11 +94,11 @@
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(inSta.getTargetSta());
if (MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol))) {
- if (!jobService.insert(initJob(locOfWms, barcode, workNo,inSta.getTargetSta() + ""))) {
+ if (!jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
- }else {
+ } else {
log.info("涓嬪彂澶辫触锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
}
} else {
@@ -117,7 +117,7 @@
private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, Integer workNo, String staNo) {
- Job job = new Job();
+ Job job = new Job();
job.setLoc(locOfWms.getLocNo());
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
index 8f244a8..1d60fa3 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
@@ -5,11 +5,11 @@
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.model.Task;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import com.zy.acs.conveyor.entity.Job;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
index 302f45d..eea0d48 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
@@ -55,12 +55,12 @@
return;
}
StaProtocol staProtocol5 = devpThread.getStation().get(1005);
- if (staProtocol5.isLoading()){
+ if (staProtocol5.isLoading()) {
log.info("1005鏈夌墿锛岀瓑鏃犵墿涔嬪悗鎵嶅叆搴�");
return;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
- Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.OUTBOUND.getStatus());
+ Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), ConveyorStateType.OUTBOUND.getStatus());
if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
staProtocol.setWorkNo(9992);
staProtocol.setStaNo(1005);
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
index 57c5a79..bfe57af 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
@@ -1,23 +1,23 @@
package com.zy.acs.conveyor.core.operation.handler;
+import com.zy.acs.conveyor.core.cache.MessageQueue;
+import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.conveyor.core.enums.ConveyorStateType;
+import com.zy.acs.conveyor.core.enums.SlaveType;
+import com.zy.acs.conveyor.core.enums.TaskType;
+import com.zy.acs.conveyor.core.model.Task;
+import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.operation.OperationHandler;
+import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
+import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.CtuMainService;
import com.zy.acs.conveyor.service.JobService;
import com.zy.acs.conveyor.service.WrkLastnoService;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
-import com.zy.acs.conveyor.core.enums.ConveyorStateType;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
-import com.zy.acs.conveyor.core.model.Task;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
-import com.zy.acs.conveyor.core.operation.OperationHandler;
-import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
-import com.zy.acs.conveyor.core.properties.SlaveProperties;
-import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
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 8132323..9d494df 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
@@ -6,10 +6,10 @@
import com.zy.acs.conveyor.core.cache.SlaveConnection;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import com.zy.acs.conveyor.entity.Job;
@@ -74,8 +74,8 @@
continue;
}
if (staProtocol.isAutoing()) {
- Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.INBOUND.getStatus());
- if (job != null ) {
+ Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), ConveyorStateType.INBOUND.getStatus());
+ if (job != null) {
if (ctuMainService.sendTask(process(job))) {
job.setJobSts(ConveyorStateType.SENDTASK.getStatus());
job.setRcsTime(new Date());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/BarcodeThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/BarcodeThread.java
index b46e455..f05431a 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/BarcodeThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/BarcodeThread.java
@@ -2,11 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.zy.acs.common.utils.News;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.DateUtils;
import com.zy.acs.conveyor.core.Slave;
import com.zy.acs.conveyor.core.ThreadHandler;
import com.zy.acs.conveyor.core.cache.OutputQueue;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.DateUtils;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
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 8995531..70cd06b 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
@@ -15,9 +15,9 @@
import com.zy.acs.conveyor.core.constant.TaskField;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.model.Task;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.entity.Devp;
import com.zy.acs.conveyor.service.DevpService;
import com.zy.acs.conveyor.utils.SpringContextUtil;
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 f3286f9..cbf2b80 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
@@ -6,21 +6,21 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
-import com.zy.acs.conveyor.entity.Devp;
-import com.zy.acs.conveyor.service.DevpService;
-import com.zy.acs.conveyor.utils.SpringContextUtil;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.DateUtils;
-import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.conveyor.core.DevpThread;
import com.zy.acs.conveyor.core.cache.MessageQueue;
import com.zy.acs.conveyor.core.cache.OutputQueue;
import com.zy.acs.conveyor.core.cache.SlaveConnection;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.model.Task;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
+import com.zy.acs.conveyor.entity.Devp;
+import com.zy.acs.conveyor.service.DevpService;
+import com.zy.acs.conveyor.utils.SpringContextUtil;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.DateUtils;
+import com.zy.acs.framework.exception.CoolException;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -283,8 +283,6 @@
News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
}
}
-
-
@Override
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
index d9ced58..1616d31 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
@@ -33,7 +33,7 @@
//@Scheduled(cron = "0 0 2 * * ?")
@Scheduled(cron = "*/5 * * * * ?")
public void autoToLog() {
- List<Job> jobs = jobMapper.listJobByJobStsAndDay(ConveyorStateType.CLEARSIGNAL.getStatus(),1);
+ List<Job> jobs = jobMapper.listJobByJobStsAndDay(ConveyorStateType.CLEARSIGNAL.getStatus(), 1);
for (Job job : jobs) {
jobService.saveJobLog(job);
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/DevpServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/DevpServiceImpl.java
index f65fddd..d2a8e03 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/DevpServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/DevpServiceImpl.java
@@ -19,7 +19,7 @@
if (de != null) {
de.setSqlData(devp);
baseMapper.updateById(de);
- }else {
+ } else {
baseMapper.insert(devp);
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
index 1904625..7d1124f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
@@ -42,7 +42,7 @@
@Override
public Job getJobByBarcode(String barcode, Integer jobSts) {
- return baseMapper.getJobByBarcodeAndJobSts(barcode,jobSts);
+ return baseMapper.getJobByBarcodeAndJobSts(barcode, jobSts);
}
@Override
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
index 5b96914..1a88175 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
@@ -76,7 +76,7 @@
}
public static void main(String[] args) {
- String s= "{\"msg\":\"Success\",\"code\":200,\"data\":{\"locNo\":\"A102400201\",\"batchNo\":\"TK2603104428\",\"taskNo\":\"TK2603104428\"}}";
+ String s = "{\"msg\":\"Success\",\"code\":200,\"data\":{\"locNo\":\"A102400201\",\"batchNo\":\"TK2603104428\",\"taskNo\":\"TK2603104428\"}}";
//System.out.println(JSON.parseObject(s).getString("data"));
ApplyInRepsonseDto applyInRepsonseDto = JSONObject.parseObject(JSON.parseObject(s).getString("data"), ApplyInRepsonseDto.class);
System.out.println(applyInRepsonseDto);
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WrkLastnoServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WrkLastnoServiceImpl.java
index f8e1ceb..32af2a6 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WrkLastnoServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WrkLastnoServiceImpl.java
@@ -13,8 +13,8 @@
@Service("wrkLastnoService")
public class WrkLastnoServiceImpl extends ServiceImpl<WrkLastnoMapper, WrkLastno> implements WrkLastnoService {
-@Autowired
-private JobService jobService;
+ @Autowired
+ private JobService jobService;
/**
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/utils/Utils.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/utils/Utils.java
index 44b1649..de11923 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/utils/Utils.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/utils/Utils.java
@@ -1,8 +1,8 @@
package com.zy.acs.conveyor.utils;
+import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.framework.common.Arith;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.conveyor.core.properties.SlaveProperties;
import java.text.DecimalFormat;
import java.util.ArrayList;
diff --git a/zy-asc-conveyor/src/main/resources/application.yml b/zy-asc-conveyor/src/main/resources/application.yml
index b0220dc..322ad5b 100644
--- a/zy-asc-conveyor/src/main/resources/application.yml
+++ b/zy-asc-conveyor/src/main/resources/application.yml
@@ -35,18 +35,18 @@
mark: 10
max-retries: 3
retry-delay: 800
-# - type: FAKEUSER
-# mark: 20
-# max-retries: 2
-# retry-delay: 800
+ # - type: FAKEUSER
+ # mark: 20
+ # max-retries: 2
+ # retry-delay: 800
- type: APPLYLOC
mark: 30
max-retries: 2
retry-delay: 2000
-# - type: INBOUND
-# mark: 40
-# max-retries: 3
-# retry-delay: 500
+ # - type: INBOUND
+ # mark: 40
+ # max-retries: 3
+ # retry-delay: 500
- type: CLEARSIGNAL
mark: 50
max-retries: 2
--
Gitblit v1.9.1