From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index d0f2fe9..9937f03 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -575,30 +575,53 @@
* 纭瀛楁竻绌�
*/
// @Scheduled(fixedDelay = 300)
+// public void confirmClear() {
+// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+// String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
+// String d04ToMES = plcParameterObject.getPlcParameter("D04ToMES").getValue();
+// String mesD01Address = plcParameterObject.getPlcParameter("MESToD01").getAddress();
+// String mesD04Address = plcParameterObject.getPlcParameter("MESToD04").getAddress();
+// String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
+// String d05ToMES = plcParameterObject.getPlcParameter("D05ToMES").getValue();
+// String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
+// String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
+// if(!REQUEST_WORD.equals(d01ToMES)){
+// S7object.getinstance().plccontrol.writeWord(mesD01Address, 0);
+// }
+// if(!REQUEST_WORD.equals(d04ToMES)){
+// S7object.getinstance().plccontrol.writeWord(mesD04Address, 0);
+// }
+// if (!REQUEST_WORD.equals(d03ToMES)) {
+// S7object.getinstance().plccontrol.writeWord(mesD03Address, 0);
+// }
+// if (!REQUEST_WORD.equals(d05ToMES)) {
+// S7object.getinstance().plccontrol.writeWord(mesD05Address, 0);
+// }
+// }
/**
* 杩涚墖鐘舵�佷慨鏀�
*/
// @Scheduled(fixedDelay = 300)
- public void feedStatusUpdate() {
- List<String> glassIds1=null;
- List<String> glassIds2=null;
- List<BigStorageCageFeedTask> bigStorageCageFeedTasks1=bigStorageCageFeedTaskService.list(
- new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState,1)
- .eq(BigStorageCageFeedTask::getLine,Const.ARTIFICIAL_OUT_TARGET_POSITION)
- );
- List<BigStorageCageFeedTask> bigStorageCageFeedTasks2=bigStorageCageFeedTaskService.list(
- new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState,1)
- .eq(BigStorageCageFeedTask::getLine,Const.TEMPERING_OUT_TARGET_POSITION)
- );
-// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)){
-//
-// }
-// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)){
-//
-// }
- }
+// public void feedStatusUpdate() {
+// List<String> glassIds1=null;
+// List<String> glassIds2=null;
+// List<BigStorageCageFeedTask> bigStorageCageFeedTasks1=bigStorageCageFeedTaskService.list(
+// new LambdaQueryWrapper<BigStorageCageFeedTask>()
+// .eq(BigStorageCageFeedTask::getTaskState,1)
+// .eq(BigStorageCageFeedTask::getLine,Const.ARTIFICIAL_OUT_TARGET_POSITION)
+// );
+// List<BigStorageCageFeedTask> bigStorageCageFeedTasks2=bigStorageCageFeedTaskService.list(
+// new LambdaQueryWrapper<BigStorageCageFeedTask>()
+// .eq(BigStorageCageFeedTask::getTaskState,1)
+// .eq(BigStorageCageFeedTask::getLine,Const.TEMPERING_OUT_TARGET_POSITION)
+// );
+//// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)){
+////
+//// }
+//// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)){
+////
+//// }
+// }
/**
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
@@ -623,8 +646,8 @@
);
EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
- edgGlassTaskInfo.setWidth((int)glassInfo.getWidth());
- edgGlassTaskInfo.setHeight((int)glassInfo.getHeight());
+ edgGlassTaskInfo.setWidth((int) glassInfo.getWidth());
+ edgGlassTaskInfo.setHeight((int) glassInfo.getHeight());
edgGlassTaskInfoList.add(edgGlassTaskInfo);
log.info("鍦ㄧ幓鐠冧俊鎭〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
}
--
Gitblit v1.8.0