From aa64540348a39c2247a79b48156e089d80f43030 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 31 十二月 2024 17:01:21 +0800
Subject: [PATCH] 1、启动关闭plc任务
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowFormulaDetailsMapper.xml | 3 +--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 3 +--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 7 +++----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 3 +--
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 4 +---
hangzhoumesParent/common/servicebase/src/main/resources/application.yml | 4 +---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java | 28 +++++++++++++++-------------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 3 +--
8 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 85d0136..b916d9e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -20,7 +20,6 @@
import com.mes.work_assignment.mapper.WorkAssignmentMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -54,8 +53,8 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
- @Value("${mes.glassGap}")
- private String erpUrl;
+
+ private final static String ERP_URL = "http://192.168.2.100:8086";
/**
@@ -308,7 +307,7 @@
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
- String url = erpUrl + "/reportingWork/mesReportingWork";
+ String url = ERP_URL + "/reportingWork/mesReportingWork";
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/application.yml b/hangzhoumesParent/common/servicebase/src/main/resources/application.yml
index 79a669d..0edfb92 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/application.yml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/application.yml
@@ -5,6 +5,4 @@
db-config:
logic-delete-field: deleted
logic-delete-value: 1
- logic-not-delete-value: 0
-mes:
- erpUrl: http://192.168.2.100:8086
\ No newline at end of file
+ logic-not-delete-value: 0
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index cf13a3b..1800c86 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@
package com.mes;
-import com.mes.common.S7object;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -17,7 +16,7 @@
public void run(ApplicationArguments args) throws Exception {
// TODO Auto-generated method stub
log.info("鍚姩瀹屾垚");
- S7object.getinstance().start();
+// S7object.getinstance().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index 1a84ab6..722766f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@
package com.mes;
-import com.mes.common.S7object;
import com.mes.job.PlcStorageCageTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
@@ -23,7 +22,7 @@
@Override
public void run(ApplicationArguments args) throws Exception {
log.info("鍚姩瀹屾垚");
- S7object.getinstance().start();
+// S7object.getinstance().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index 4f6a172..c706ba2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@
package com.mes;
-import com.mes.common.S7object;
import com.mes.job.PlcLoadGlassTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
@@ -23,7 +22,6 @@
@Override
public void run(ApplicationArguments args) throws Exception {
log.info("鍚姩瀹屾垚");
- S7object.getinstance().start();
-
+// S7object.getinstance().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index 0fe78d6..35cd283 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,7 +1,6 @@
package com.mes;
-import com.mes.common.S7object;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -20,6 +19,6 @@
@Override
public void run(ApplicationArguments args) throws Exception {
log.info("鍚姩瀹屾垚");
- S7object.getinstance().start();
+// S7object.getinstance().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
index a124830..3209e5b 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
@@ -56,7 +56,7 @@
return;
}
ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
- if (StringUtils.isBlank(glassIdEntity.getValue() + "")) {
+ if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
log.info("褰撳墠鏈敹鍒扮幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
@@ -68,27 +68,29 @@
}
//鎸夌収浠诲姟id鑾峰彇瀵瑰簲鐨勯厤鏂逛俊鎭�
- List<ReadWriteEntity> list = new ArrayList<>();
+ List<ReadWriteEntity> ualist = new ArrayList<>();
+ List<ReadWriteEntity> wordlist = new ArrayList<>();
- if (detailsVO.getFilmRemove() != 0) {
+ if (detailsVO.getFilmRemove() == 0) {
// 10111011
int sendId = request & 273;
sendId = sendId + 4;
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+ wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
} else {
// 鍏堝皢瀵瑰簲鐨勪綅缃负0锛岃幏寰楄姹傜殑鐜荤拑鏁版嵁锛� 鐒跺悗灏嗗搴斾綅鍊� 110111011
int sendId = request & 273;
sendId = sendId + 4 + 64;
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
+ wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
}
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", detailsVO.getThickness()));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", Math.max(detailsVO.getWidth(), detailsVO.getHeight())));
- list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", Math.min(detailsVO.getWidth(), detailsVO.getHeight())));
- miloService.writeToOpcWord(list);
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", (int) (detailsVO.getThickness() * 10)));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
+ ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
+ miloService.writeToOpcWord(wordlist);
+ miloService.writeToOpcUa(ualist);
return;
}
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowFormulaDetailsMapper.xml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowFormulaDetailsMapper.xml
index 1fb7ece..8748a21 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowFormulaDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/mapper/HollowFormulaDetailsMapper.xml
@@ -42,7 +42,7 @@
inner join glass_info t2 on t1.glass_id = t2.glass_id
inner join hollow_formula_details t3 on t.formula_id = t3.id
<where>
- t.state in (0,1,2)
+ 1=1
<if test="glassId != null and glassId !=''">
and t1.glass_id = #{glassId}
</if>
@@ -52,7 +52,6 @@
<if test="cell != null and cell !=''">
and t.cell = #{cell}
</if>
-
</where>
limit 1
</select>
--
Gitblit v1.8.0