From 31c0c608f884ab548ba4c57ebcddef6f46da460e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 13:15:06 +0800
Subject: [PATCH] 卧式理片笼进出片任务优化
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java
index 8ca8e6d..7331a33 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java
@@ -1,6 +1,5 @@
package com.mes.common;
-import cn.hutool.core.date.DateTime;
import cn.hutool.json.JSONObject;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
@@ -17,10 +16,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@Slf4j
@@ -60,13 +56,13 @@
// //mapType.put("A10_glass_status", "Word");
// mapType.put("A09_prohibit_film_production", "Word");
// mapType.put("A10_prohibit_film_production", "Word");
- mapValue.put("A06_request_word","1");//璇锋眰瀛�
- mapValue.put("A05_scanning_ID","11111111111");//璇锋眰ID
- mapValue.put("MES_confirmation_word","0");//MES鍙戦�佸瓧
- mapValue.put("A09_glass_status","0");//A09鐜荤拑鐘舵��
- mapValue.put("A10_glass_status","0");//A09鐜荤拑鐘舵��
- mapValue.put("A09_prohibit_film_production","0");//A9绂佹鍑虹墖
- mapValue.put("A10_prohibit_film_production","0");//A10绂佹鍑虹墖
+ mapValue.put("A06_request_word", "1");//璇锋眰瀛�
+ mapValue.put("A05_scanning_ID", "11111111111");//璇锋眰ID
+ mapValue.put("MES_confirmation_word", "0");//MES鍙戦�佸瓧
+ mapValue.put("A09_glass_status", "0");//A09鐜荤拑鐘舵��
+ mapValue.put("A10_glass_status", "0");//A09鐜荤拑鐘舵��
+ mapValue.put("A09_prohibit_film_production", "0");//A9绂佹鍑虹墖
+ mapValue.put("A10_prohibit_film_production", "0");//A10绂佹鍑虹墖
}
@@ -91,10 +87,10 @@
taskCache.setStartCell(0);
taskCache.setEndCell(edgStorageCage.getSlot());
taskCache.setTaskType(1);
- taskCache.setCreateTime(new DateTime());
+ taskCache.setCreateTime(new Date());
edgStorageCageDetailsMapper.updateById(edgStorageCageDetails);
taskCacheService.insertTaskCache(taskCache);
- S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short)1);
+ S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short) 1);
} else {
log.info("涓嶅瓨鍦ㄧ┖鏍�");
}
@@ -129,9 +125,9 @@
taskCache.setStartCell(outEdgStorageCageDetails.getSlot());
taskCache.setEndCell(endcell);
taskCache.setTaskType(2);
- taskCache.setCreateTime(new DateTime());
+ taskCache.setCreateTime(new Date());
taskCacheService.insertTaskCache(taskCache);
- S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short)1);
+ S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short) 1);
}
--
Gitblit v1.8.0