From 98255c411252fa465231a33a516bcab54119c97f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 15 四月 2024 10:55:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
index 01629c3..113a8af 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -21,48 +21,37 @@
private TemperingGlassInfoService temperingGlassInfoService;
@Autowired
private GlassInfoService glassInfoService;
+
@Override
public void run() {
while (this != null) {
try {
-
Thread.sleep(500);
- String plcFeedReq ="0";
- String plcFeedGlassid ="111";
+ String plcFeedReq = "0";
+ String plcFeedGlassid = "111";
//Plc杩涚墖璇锋眰鏃�
- if("1".equals(plcFeedReq)){
- BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
+ if ("1".equals(plcFeedReq)) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
//浼犲叆鐜荤拑id
- GlassInfo glassInfo=glassInfoService.getById(plcFeedGlassid);
+ GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
- BigStorageCageDetails SlotInfo=bigStorageCageService.FeedGlass(glassInfo,bigStorageCageDetails);
- if(SlotInfo!=null){
+ BigStorageCageDetails SlotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
+ if (SlotInfo != null) {
//plc浠诲姟鍙戦�佸瓧
}
}
//鍑虹墖璇锋眰
- String plcOutReq ="0";
- boolean result=false;
- if("1".equals(plcOutReq)){
+ String plcOutReq = "0";
+ boolean result = false;
+ if ("1".equals(plcOutReq)) {
//鑾峰彇閽㈠寲灏忕墖琛ㄦ湭鍑虹淇℃伅
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
- //娌℃湁鍙嚭鐨勭幓鐠冩椂
- if(temperingGlassInfoList!=null){
- //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
- result = bigStorageCageDetailsService.getTemperingGlass();
- }else{
- //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
- temperingGlassInfoService.addOutTask(temperingGlassInfoList);
- result=true;
- }
- if(result==true){
+
+ if (result == true) {
//plc浠诲姟鍙戦�佸瓧
}
}
-
-
} catch (Exception e) {
--
Gitblit v1.8.0