From 994b07344c976abcb33ff5eaecd685f6461be5ea Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 17 十二月 2025 11:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index 442fbb7..a3b8123 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
+import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
import com.github.yulichang.toolkit.JoinWrappers;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
@@ -87,6 +88,9 @@
@Autowired
@Qualifier("s7SerializerDLPTwo")
private S7Serializer s7SerializerDLPTwo;
+ @Autowired
+ @Qualifier("s7plcWZL")
+ private S7PLC s7plcWZL;
@Resource
SysConfigService sysConfigService;
@@ -256,13 +260,13 @@
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
- ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
- alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
- alarmInfo.setAlarmModule(ALARM_MODULE);
- alarmInfo.setAlarmType(ALARM_TYPE);
- alarmInfo.setAlarmCode(ALARM_CODE_OVER);
- alarmInfo.setAlarmMessage("");
- productAlarmInfoService.save(alarmInfo);
+// ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+// alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+// alarmInfo.setAlarmModule(ALARM_MODULE);
+// alarmInfo.setAlarmType(ALARM_TYPE);
+// alarmInfo.setAlarmCode(ALARM_CODE_OVER);
+// alarmInfo.setAlarmMessage("");
+// productAlarmInfoService.save(alarmInfo);
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
s7DataDLPOne = new S7DataDLPOne();
@@ -465,6 +469,16 @@
Integer temperingOutTargetPosition = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_TEMPERING_OUT_TARGET_POSITION);
if (redisUtil.getCacheObject("temperingSwitch")) {
+ try {
+ int outRequest = s7plcWZL.readUInt16("DB51.8");
+ if (outRequest == 0) {
+ log.info("褰撳墠鏈敹鍒板崸杞珛鍏佽鍑虹墖璇锋眰锛岀粨鏉熷嚭鐗囦换鍔�");
+ return;
+ }
+ } catch (Exception e) {
+ log.error("璇诲彇鍗ц浆绔嬩俊鍙峰紓甯�", e);
+ return;
+ }
//鏄惁鍏佽閽㈠寲
//鏄惁鏈夋鍦ㄩ挗鍖栫殑鐜荤拑:閽㈠寲灏忕墖琛ㄥ叧鑱斿巻鍙蹭换鍔¤〃锛岀瓫閫夋湭鍑虹鐨勭幓鐠冧俊鎭�
// 鑾峰彇褰撳墠閽㈠寲浠诲姟鏈畬鎴愬嚭鐗囩殑鐜荤拑淇℃伅
@@ -912,7 +926,7 @@
damage.setWorkingProcedure("澶х悊鐗囩");
damage.setRemark("杩涚鍓嶅崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
}
@@ -937,7 +951,7 @@
damage.setWorkingProcedure("閽㈠寲鍓�");
damage.setRemark("杩涚鍚庡崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
slotList.add(item.getStartSlot());
--
Gitblit v1.8.0