zy-asc-conveyor/pom.xml
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; 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.*;
@@ -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; 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; /** * 消息队列 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/DeviceField.java
@@ -36,6 +36,7 @@ /** * 根据 DB 块编号和站点偏移生成具体地址 * * @param dbBlock DB块编号 * @param stationBaseOffset 站点基址偏移（站点号*站点长度） * @return PLC4X 地址字符串，如 "DB100.DBD0" zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcAlarmDefinition.java
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/PlcConstant.java
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/StationStatusField.java
@@ -22,6 +22,7 @@ /** * 根据 DB 块编号和站点偏移生成具体地址 * * @param dbBlock DB块编号 * @param stationBaseOffset 站点基址偏移（站点号*站点长度） * @return PLC4X 地址字符串，如 "DB100.DBD0" zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java
@@ -35,6 +35,7 @@ /** * 根据 DB 块编号和站点偏移生成具体地址 * * @param dbBlock DB块编号 * @param stationBaseOffset 站点基址偏移（站点号*站点长度） * @return PLC4X 地址字符串，如 "DB100.DBD0" 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; 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; zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java
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; 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; 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;
@@ -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; 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 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/DevpServiceImpl.java
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WmsMainServiceImpl.java
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/WrkLastnoServiceImpl.java
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; zy-asc-conveyor/src/main/resources/application.yml
