From 4725595ed0d3684bde0efbe45889482b46bc6fb0 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 16:38:26 +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/EdgStorageCageServiceImpl.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index c59ac0c..ee05420 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,6 +9,8 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageService;
+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.Map;
@@ -23,53 +26,63 @@
* @since 2024-04-07
*/
@Service
-public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
+public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Autowired
- EdgStorageCageMapper edgStorageCageMapper;
@Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+ @Autowired
+ UpPattenUsageMapper upPattenUsageMapper;
+ /**
+ * 鏌ヨ绗煎唴绌烘牸
+ * @return
+ */
@Override
- //鏌ヨ绗煎唴绌烘牸
public List<Map> selectCacheEmpty(){
- List<Map> map=edgStorageCageMapper.selectJoinList(
+ return baseMapper.selectJoinList(
Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
.isNull("escd.slot")
);
- return map;
}
+ /**
+ * 鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
+ * @return
+ */
@Override
- //鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
public List<Map> selectCacheOut(){
- List<Map> list= edgStorageCageMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+ return upPattenUsageMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
.isNotNull("escd.slot")
.orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
);
- return list;
}
+ /**
+ * 鐞嗙墖缂撳瓨璇︽儏
+ * @return
+ */
@Override
- //鐞嗙墖缂撳瓨璇︽儏
public List<Map> selectEdgStorageCages(){
- List<Map> map=edgStorageCageMapper.selectJoinList(
+ return baseMapper.selectJoinList(
Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
);
- return map;
}
+ /**
+ * 淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ * @param edgStorageCage
+ * @return
+ */
@Override
- //淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
- edgStorageCageMapper.updateById(edgStorageCage);
+ baseMapper.updateById(edgStorageCage);
return true;
}
--
Gitblit v1.8.0