From 0477b72d30cfe7d412edeb237aa587b1c5242207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 09 七月 2024 08:34:31 +0800
Subject: [PATCH] 1、任务新增计时功能，日志打印每次任务执行的周期 2、卧式理片笼更新出片规则：都为禁用（2），笼子不出玻璃；存在一个禁用，07片台可以存玻璃；都非禁用：两片台有玻璃笼子不出片
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 219c790..0d6ddce 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -24,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.print.attribute.standard.MediaSize;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -90,8 +91,8 @@
public List<Map<String, Object>> selectCutTerritory() {
List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
- .eq(UpPattenUsage::getState, 1));
-
+ .orderByDesc(UpPattenUsage::getState)
+ .orderByDesc(UpPattenUsage::getId));
if (!upPattenUsage.isEmpty()) {
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
--
Gitblit v1.8.0