From e5e576ab6840b8030a60a1e67fb94728f7ec2ae2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 24 四月 2024 16:27:03 +0800
Subject: [PATCH] Changes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 105 insertions(+), 65 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index 4b4dfab..566d3e1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,22 +1,20 @@
package com.mes.downstorage.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.downstorage.entity.DownStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Collections;
-import java.util.Comparator;
+
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -27,7 +25,7 @@
*/
@Slf4j
@Service
-public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
+public class DownStorageCageServiceImpl extends MPJBaseServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
@Autowired
private DownStorageCageMapper downStorageCageMapper;
@Override
@@ -40,17 +38,19 @@
@Override
- public List<Map> getCacheLeisure() {
+ public List<DownStorageCageDetails> getCacheLeisure() {
log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�");
- List<Map> map = downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNull("escd.slot")
- .orderByAsc("escd.slot")
+ MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNull("escd.slot")
+ .orderByAsc("escd.slot");
+ List<DownStorageCageDetails> list = baseMapper.selectJoinList(
+ DownStorageCageDetails.class,mpjQueryWrapper
);
- return map;
+ return list;
}
+
// @Override
// public List<Map> getCacheOut(int start, int end) {
@@ -72,78 +72,118 @@
@Override
- public List<Map> getCacheOut(int start, int end) {
+ public List<DownStorageCageDetails> getCacheOut(int start, int end) {
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
- List<Map> map = downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
- .isNotNull("escd.slot")
- .between("dw.workstation_id", start, end)
- .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+ MPJQueryWrapper mpjQueryWrapper =new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+ .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ")
+ .isNotNull("escd.slot")
+ .between("dw.workstation_id", start, end)
+ .orderByDesc("escd.width")
+ .orderByDesc("escd.height");
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, mpjQueryWrapper
);
-
- // 瀵硅幏鍙栫殑鏁版嵁鍒楄〃鎸夌収瀹藉害杩涜鎺掑簭
- Collections.sort(map, new Comparator<Map>() {
- @Override
- public int compare(Map o1, Map o2) {
- // 鑾峰彇瀹藉害骞舵瘮杈�
- double width1 = (double) o1.get("width");
- double width2 = (double) o2.get("width");
- return Double.compare(width2, width1);
- }
- });
-
- return map;
}
+
+
+
@Override
public List<Map> getCacheInfo() {
log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
- List<Map> map = downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .orderByAsc("t.slot")
+ MPJQueryWrapper mpjQueryWrapper =new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .orderByAsc("t.slot");
+ return downStorageCageMapper.selectJoinList(
+ Map.class,mpjQueryWrapper
);
- return map;
+
}
+
+
@Override
- public List<Map> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
+ public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
-
-
- List<Map> map = downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .eq("escd.tempering_layout_id", tempering_layout_id)
- .lt("escd.tempering_feed_sequence", tempering_feed_sequence)
- .gt("t.remain_width", width)
- .orderByAsc("escd.tempering_feed_sequence")
+ MPJQueryWrapper mpjQueryWrapper =new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .eq("escd.tempering_layout_id", tempering_layout_id)
+ .lt("escd.tempering_feed_sequence", tempering_feed_sequence)
+ .gt("t.remain_width", width)
+ .orderByAsc("escd.tempering_feed_sequence");
+ List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, mpjQueryWrapper
);
- return map;
+ return list;
}
+
+
+
@Override
- public List<Map> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
- List<Map> map = downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .lt("escd.tempering_layout_id", tempering_layout_id)
- .gt("t.remain_width", width)
- .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+ public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
+ MPJQueryWrapper mpjQueryWrapper =new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .eq("escd.flow_card_id", flowcardid)
+ .gt("t.remain_width", width)
+ .orderByAsc("escd.tempering_feed_sequence");
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, mpjQueryWrapper
);
- return map;
+
}
+ @Override
+ public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+ MPJQueryWrapper mpjQueryWrapper =new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .lt("escd.flow_card_id", flowcardid)
+ // 鏉′欢 t.remain_width - width > 0
+ .apply("t.remain_width - " + width + " > 0")
+ .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence");
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class,mpjQueryWrapper
+ );
+
+ }
+
+
+ @Override
+ public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+ MPJQueryWrapper mpjQueryWrapper =new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .lt("escd.tempering_layout_id", tempering_layout_id)
+ // 鏉′欢 t.remain_width - width > 0
+ .apply("t.remain_width - " + width + " > 0")
+ .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence");
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, mpjQueryWrapper
+ );
+
+ }
+
+
+
+
+
+
}
--
Gitblit v1.8.0