From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java |  112 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index ee90fdb..ca8b290 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -8,6 +8,7 @@
 import com.kangaroohy.milo.model.ReadWriteEntity;
 import com.kangaroohy.milo.service.MiloService;
 import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
 import com.mes.damage.service.DamageService;
 import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
 import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
@@ -21,11 +22,11 @@
 import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
 import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
 import com.mes.opctask.service.EdgStorageDeviceTaskService;
+import com.mes.sysconfig.service.SysConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -64,35 +65,35 @@
     EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
     @Resource
     DamageService damageService;
+    @Resource
+    SysConfigService sysConfigService;
 
-    @Value("${mes.glassGap}")
-    private int glassGap;
-    @Value("${mes.threshold}")
+    //    @Value("${mes.threshold}")
     private int threshold;
-    @Value("${mes.cellLength}")
+    //    @Value("${mes.cellLength}")
     private int cellLength;
-    @Value("${mes.ratio}")
+    //    @Value("${mes.ratio}")
     private int ratio;
 
-    @Value("${mes.min.one.firstLength}")
+    //    @Value("${mes.min.one.firstLength}")
     private int minOneFirstLength;
-
-    @Value("${mes.min.one.secondLength}")
+    //
+//    @Value("${mes.min.one.secondLength}")
     private int minOneSecondLength;
-
-    @Value("${mes.min.two.firstLength}")
+    //
+//    @Value("${mes.min.two.firstLength}")
     private int minTwoFirstLength;
-
-    @Value("${mes.min.two.secondLength}")
+    //
+//    @Value("${mes.min.two.secondLength}")
     private int minTwoSecondLength;
-
-    @Value("${mes.max.firstLength}")
+    //
+//    @Value("${mes.max.firstLength}")
     private int maxTwoFirstLength;
-
-    @Value("${mes.max.secondLength}")
+    //
+//    @Value("${mes.max.secondLength}")
     private int maxTwoSecondLength;
-
-    @Value("${mes.maxThickness}")
+    //
+//    @Value("${mes.maxThickness}")
     private int maxThickness;
 
     private String glassInIdOne = "";
@@ -124,6 +125,17 @@
     }
 
     private void startOneOpcTaskChild(String tableName, int device, int cellFlag) throws Exception {
+        threshold = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_THRESHOLD);
+        cellLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_CELL_LENGTH);
+        ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
+        minOneFirstLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_ONE_FIRST_LENGTH);
+        minOneSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_ONE_SECOND_LENGTH);
+        minTwoFirstLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_TWO_FIRST_LENGTH);
+        minTwoSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_TWO_SECOND_LENGTH);
+        maxTwoFirstLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_FIRST_LENGTH);
+        maxTwoSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_SECOND_LENGTH);
+        maxThickness = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_THICKNESS);
+
         EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);
         if (task == null) {
             log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
@@ -200,6 +212,7 @@
     }
 
     private void edgTaskChild(String glassId, int cell) throws Exception {
+        ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
         GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId).last("limit 1"));
         if (glassInfo == null) {
             log.info("瀵瑰垪琛ㄤ腑鐨勭幓鐠僫d閿欒锛岃妫�鏌ユ暟鎹紝鐜荤拑id锛歿}", glassId);
@@ -210,11 +223,11 @@
 //        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".mesControl", true));
         list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".glassId", Integer.parseInt(toEndingId)));
         list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".toEdingId", Integer.parseInt(toEndingId)));
-        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
-        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
+        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
+        list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
 
         miloService.writeToOpcUa(list);
-        miloService.writeToOpcWord(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".thickness", (int) glassInfo.getThickness() * 10));
+        miloService.writeToOpcWord(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".thickness", (int) glassInfo.getThickness() * ratio));
         //淇敼纾ㄨ竟瀵瑰垪涓殑纾ㄨ竟绾胯矾鍙婄姸鎬�
         edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
                 .set(EdgGlassTaskInfo::getLine, cell)
@@ -248,11 +261,14 @@
         }
         int firstLength = minTwoFirstLength;
         int secondLength = minTwoSecondLength;
+        int fecondMaxLength = 2300;
         if (deviceId == 1) {
             firstLength = minOneFirstLength;
             secondLength = minOneSecondLength;
+            fecondMaxLength = 2500;
         }
-        if (Math.max(glassInfo.getWidth(), glassInfo.getHeight()) < firstLength || Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < secondLength) {
+        if (Math.max(glassInfo.getWidth(), glassInfo.getHeight()) < firstLength || Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < secondLength
+                || Math.max(glassInfo.getWidth(), glassInfo.getHeight()) > fecondMaxLength) {
             log.info("杩涚墖鐜荤拑灏哄灏忎簬{}*{}锛岀姝㈣繘绗肩幓鐠僫d:{}锛屽昂瀵镐负{}銆亄}", firstLength, secondLength, task.getGlassIdIn(), glassInfo.getWidth(), glassInfo.getHeight());
             Date endDate = new Date();
             log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
@@ -289,20 +305,41 @@
         //鑾峰彇瀵瑰簲鐨勮澶囩姸鎬佷俊鎭�
         ReadWriteEntity oneOutStateEntity = miloService.readFromOpcUa("WL1.WL1.slotState");
         ReadWriteEntity twoOutStateEntity = miloService.readFromOpcUa("WL2.WL2.slotState");
+        ReadWriteEntity d06OutStateEntity = miloService.readFromOpcUa("WL2.WL2.d06SlotState");
         //鐘舵�佹湁3涓儏鍐碉細0绌洪棽 1蹇欑 2绂佺敤
-        String oneOutState = "2";
-        String twoOutState = "2";
+        String oneOutState = Const.OUT_DISABLE;
+        String twoOutState = Const.OUT_DISABLE;
+        String d06OutState = Const.OUT_DISABLE;
         if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
             oneOutState = oneOutStateEntity.getValue().toString();
         }
         if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
             twoOutState = twoOutStateEntity.getValue().toString();
         }
-
-        if ((cellFlag == 2 && Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) || (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState))) {
+        //涓ゆ潯绾块兘涓虹鐢ㄥ垯涓嶅嚭鐜荤拑
+        if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
             log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
             return Boolean.FALSE;
         }
+        if (null != d06OutStateEntity && null != d06OutStateEntity.getValue()) {
+            d06OutState = d06OutStateEntity.getValue().toString();
+        }
+        //鑾峰彇d06鐗囧彴鐘舵��
+        // 1:涓�瀵逛竴鐨勬儏鍐典笅涓嶉渶瑕佸垽鏂璬06鐘舵��
+        // 2:涓�鍙风嚎涓�瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦簩鍙风嚎纾ㄨ竟鍓嶇墖鍙癉07鐨勭姸鎬侊紝D07闈炵鐢ㄦ椂锛屼簩鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
+        // 3:浜屽彿绾夸竴瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦竴鍙风嚎纾ㄨ竟鍓嶇墖鍙癈08鐨勭姸鎬侊紝C08闈炵鐢ㄦ椂锛屼竴鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
+        if (cellFlag == 2) {
+            if (deviceId == 1) {
+                twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
+            } else {
+                oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
+            }
+            if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
+                log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
+                return Boolean.FALSE;
+            }
+        }
+
         log.info("寮�濮嬫墽琛屽嚭鐗�/鐩撮�氫换鍔★紝浠诲姟淇℃伅涓猴細{},琛ㄥ悕涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{},涓�鍙风嚎鐘舵�侊細{}锛屼簩鍙风嚎鐘舵�侊細{}",
                 task, tableName, deviceId, startDate, oneOutState, twoOutState);
         //鑾峰彇褰撳墠闇�瑕佽蛋閭f潯绾�
@@ -715,27 +752,6 @@
         taskHistory.setTaskState(Const.RAW_GLASS_TASK_NEW);
         taskHistory.setDeviceId(deviceId);
         edgStorageDeviceTaskHistoryService.save(taskHistory);
-        return Boolean.TRUE;
-    }
-
-    public boolean updateCellRemainWidth(int slot, int device, EdgStorageDeviceTaskHistory taskHistory) {
-        List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot)
-                .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
-        int remainWidth = cellLength;
-        if (CollectionUtil.isNotEmpty(list)) {
-            if (2 == taskHistory.getTaskType()) {
-                remainWidth = 0;
-            } else {
-                for (EdgStorageCageDetails item : list) {
-                    remainWidth = remainWidth - glassGap - (int) Math.max(item.getWidth(), item.getHeight());
-                }
-                if (remainWidth <= 0) {
-                    remainWidth = 0;
-                }
-            }
-        }
-        edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().
-                set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot).eq(EdgStorageCage::getDeviceId, device));
         return Boolean.TRUE;
     }
 

--
Gitblit v1.8.0