From 92b68e97ff48e3e6411cee61439e95e216eb392e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 12:51:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 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..1710e43 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,74 @@
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.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.taskcache.mapper.HangzhouMesMapper;
+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
+ 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> 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;
+ return null;
+ }
+
+ ;
+
}
--
Gitblit v1.8.0