From 1c42fd4d4df13f5e3850663999bb3170dace6861 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 七月 2024 09:51:25 +0800
Subject: [PATCH] 切割当前版图报错  glassid有重复   加筛选条件 state=100

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 0d6ddce..481483a 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
@@ -7,6 +7,7 @@
 import com.github.yulichang.query.MPJLambdaQueryWrapper;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
 import com.mes.edgstoragecage.entity.EdgStorageCage;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -109,7 +110,8 @@
             for (Map<String, Object> cutTerritory : cutTerritorys) {
                 EdgStorageCageDetails edgStorageCageDetails=baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
                         .selectAll(EdgStorageCageDetails.class)
-                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id")));
+                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))
+                        .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
 //                log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
                 if(edgStorageCageDetails!=null){
                     cutTerritory.put("glass_state",edgStorageCageDetails.getState());

--
Gitblit v1.8.0