From 7fdefac0ffa4dbf8f88cb00d7628af8f676a4fe9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 19 四月 2024 10:20:33 +0800
Subject: [PATCH] 增加上片表修改接口

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 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 f23de00..45cf60f 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,11 +1,10 @@
 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;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
 import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
 import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -17,54 +16,60 @@
 
 /**
  * <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
-    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;
-        }
+    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> 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 list;
+    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 list;
+
+        return null;
     }
+
     //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
     @Override
-    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;
-    };
+    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;
+        return null;
+    }
+
+    ;
 
 
 }

--
Gitblit v1.8.0