Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-20 a745fd53a1c8840a886c826c6a6bf0b8b226cd25

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java

@@ -214,12 +214,13 @@
        // 优先 超出尺寸优先人工出片 人工处理
        if (!list1to6.isEmpty()) {
            DownStorageCageDetails item3 = list1to6.get(0);
            //后期有生产规则
            if (item3.getHeight() >= 2500 && item3.getWidth() >= 2660) {
                log.info("人工处理");
                selectedItem = item3;

            } else if (!!list1to6.isEmpty()) {
                log.info("前后端都空闲 优先后端出片并且优先满架");
                log.info("前后端都空闲优先满架");
                selectedItem = list1to6.get(0);
            }
        }