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"; //输送线安全交互标识 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/DeviceField.java
File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/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） */ zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/PlcAlarmDefinition.java
File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/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） zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SafeSignalField.java
File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/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 {
File was deleted zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/StationStatusField.java
File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/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） */ zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/TaskField.java
File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/constant/TaskField.java @@ -1,4 +1,4 @@ package com.zy.acs.conveyor.core.constant; package com.zy.acs.conveyor.core.enums; /** 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;
@@ -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); 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; } 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; zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
@@ -38,6 +38,7 @@ private Integer sourceStaNo; private Integer staNo;
@@ -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; 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; 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); 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>
@@ -788,7 +788,7 @@ <th>目标站</th> <th>条码</th> <th>安全信号</th> <!-- <th>高低信号</th>--> <!-- <th>高低信号</th>--> </tr> </thead> <tbody>
