From dc7f1d12fa03f487232a00d62cdbec42fdd39d5a Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:40:54 +0800
Subject: [PATCH] 代码丢失重新提交

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 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 e19b2cc..f23de00 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,5 +1,6 @@
 package com.mes.edgstoragecage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
 import com.mes.edgstoragecage.entity.EdgStorageCage;
@@ -29,22 +30,40 @@
     private HangzhouMesMapper hangzhouMesMapper;
     @Autowired
     private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
-
-    //鑾峰彇纾ㄨ竟鍓嶇紦瀛樼悊鐗囩淇℃伅
+    //璇嗗埆 鐮存崯/鎷胯蛋
+    public boolean identWorn(String glassid,int ControlsId){
+        List<EdgStorageCageDetails> edgStorageCageDetails=edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
+        if(edgStorageCageDetails.size()==1){
+            edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0),new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
+            return true;
+        }
+        return false;
+    }
+    //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
     @Override
-    public List<Map> getEdgStorageInfos(){
-        List<Map> map=edgStorageCageDetailsMapper.selectJoinList(
-                Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
-                        .select("a.c","a.d")
-                        .leftJoin("ab a on t.id=a.id")
-                        .le("a.id","1")
+    public List<Map> selectCutTerritory(){
+        List<Map> list= edgStorageCageDetailsMapper.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("state",1)
+                        .orderByAsc("t.layout_sequence")
         );
-        return map;
-    };
-
+        return list;
+    }
+    //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
     @Override
-    public List<Map> setEdgStorageInfos(){
-        return hangzhouMesMapper.selectCachInfo();
+    public List<Map> selectCurrentCutTerritory(String current){
+        List<Map> list= edgStorageCageDetailsMapper.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