From 04b841aa1661693e68f5dea1a80e7c97a209cbeb Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 13:31:48 +0800
Subject: [PATCH] 命名以及  注解修改

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |   62 +++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 3 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 78a5a2e..52623b7 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
@@ -1,20 +1,76 @@
 package com.mes.edgstoragecage.service.impl;
 
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.interfaces.LambdaJoin;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
 import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.taskcache.mapper.HangzhouMesMapper;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
- *  鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author zhoush
  * @since 2024-04-07
  */
 @Service
-public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
+public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
+
+    @Autowired
+    UpPattenUsageMapper upPattenUsageMapper;
+
+    //璇嗗埆 鐮存崯/鎷胯蛋
+    public boolean identWorn(String glassid, int ControlsId) {
+        List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+        if (edgStorageCageDetails.size() == 1) {
+            baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+            return true;
+        }
+        return false;
+    }
+
+    //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+    @Override
+    public List<Map> selectCutTerritory() {
+        List<Map> list = upPattenUsageMapper.selectJoinList(
+                Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
+                        .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
+                        .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
+                        .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
+                        .eq("t.state", 1)
+                        .orderByAsc("t.layout_sequence")
+        );
+        return list;
+    }
+
+    //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+    @Override
+    public List<Map> selectCurrentCutTerritory(String current) {
+        List<Map> list = baseMapper.selectJoinList(
+                Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+                        .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
+                        .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
+                        .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
+                        .eq("t.engineering_id", current)
+                        .orderByAsc("t.layout_sequence")
+        );
+      return list;
+    }
+
+    ;
+
 
 }

--
Gitblit v1.8.0