From 52287925ae0004d67d99929daf6755ceab0f732d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 17 十二月 2024 09:49:54 +0800
Subject: [PATCH] 1、大理片笼格子详情查询按钮，默认deviceid为1，

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java          |    7 +++
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java    |   16 ++++++-
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java |   17 ++++++++
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/BigStorageAndDetailsDTO.java     |   20 ++++++++++
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigStorageDetailsQueryVO.java     |   40 ++++++++++++++++++++
 5 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 9e0ce6c..44e0837 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -1,4 +1,8 @@
 package com.mes.bigstorage.controller;
+
+import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
+import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
 import com.mes.bigstorage.service.BigStorageCageService;
 import com.mes.utils.Result;
 import io.swagger.annotations.Api;
@@ -28,9 +32,15 @@
 
     @ApiOperation("鐞嗙墖绗煎惎鐢ㄧ鐢�")
     @GetMapping("/updateStorageCageDisabled")
-    public Result updateStorageCageDisabled(int slot,int enableState) {
-        bigStorageCageService.updateStorageCageDisabled(slot,enableState);
-        return Result.build(200,"鍚敤/绂佺敤鎴愬姛",1);
+    public Result updateStorageCageDisabled(int slot, int enableState) {
+        bigStorageCageService.updateStorageCageDisabled(slot, enableState);
+        return Result.build(200, "鍚敤/绂佺敤鎴愬姛", 1);
+    }
+
+    @ApiOperation("鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�")
+    @GetMapping("/querybigStorageCageDetail")
+    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {
+        return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageService.querybigStorageCageDetail(query));
     }
 
 }
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/BigStorageAndDetailsDTO.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/BigStorageAndDetailsDTO.java
new file mode 100644
index 0000000..8d126d5
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/BigStorageAndDetailsDTO.java
@@ -0,0 +1,20 @@
+package com.mes.bigstorage.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/6/11 16:45
+ * @Description:
+ */
+@Data
+public class BigStorageAndDetailsDTO extends BigStorageCage {
+
+    private List<BigStorageCageDetails> bigStorageCageDetails;
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigStorageDetailsQueryVO.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigStorageDetailsQueryVO.java
new file mode 100644
index 0000000..93655a0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigStorageDetailsQueryVO.java
@@ -0,0 +1,40 @@
+package com.mes.bigstorage.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/6/13 15:51
+ * @Description:
+ */
+@Data
+public class BigStorageDetailsQueryVO {
+    /**
+     * 璁惧id
+     */
+    private Integer deviceId;
+    /**
+     * 娴佺▼鍗�
+     */
+    private String flowCardId;
+    /**
+     * 鑶滅郴
+     */
+    private String filmsId;
+    /**
+     *鏈�灏忓搴�
+     */
+    private Integer minWidth;
+    /**
+     *鏈�澶у搴�
+     */
+    private Integer maxWidth;
+    /**
+     *鏈�灏忛珮搴�
+     */
+    private Integer minHeight;
+    /**
+     *鏈�澶ч珮搴�
+     */
+    private Integer maxHeight;
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
index 14eb11a..becb3ba 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -3,6 +3,8 @@
 import com.github.yulichang.base.MPJBaseService;
 import com.mes.bigstorage.entity.BigStorageCage;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
+import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
 import com.mes.glassinfo.entity.GlassInfo;
 
 import java.util.List;
@@ -23,6 +25,11 @@
     BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
 
     boolean outGlass();
+    /**
+     * 鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�
+     * @return
+     */
+    List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query);
 
     List<BigStorageCage> querybigStorageCageDetailAll();
 
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index ac0d729..d4bd55a 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -3,11 +3,14 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mes.bigstorage.entity.BigStorageCage;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
+import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
 import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
 import com.mes.bigstorage.mapper.BigStorageCageMapper;
 import com.mes.bigstorage.service.BigStorageCageService;
@@ -213,6 +216,20 @@
         return false;
     }
 
+    @Override
+    public List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {
+        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
+                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
+                .eq(BigStorageCageDetails::getDeviceId,query.getDeviceId())
+                .eq(StringUtils.isNotBlank(query.getFilmsId()),BigStorageCageDetails::getFilmsId,query.getFilmsId())
+                .eq(StringUtils.isNotBlank(query.getFlowCardId()),BigStorageCageDetails::getFlowCardId,query.getFlowCardId())
+                .orderByAsc(BigStorageCage::getDeviceId)
+                .orderByAsc(BigStorageCage::getSlot);
+        return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);
+    }
+
     //璁＄畻鏍煎瓙鍓╀綑瀹藉害
     @Override
     public void updateRemainWidth(int slot) {

--
Gitblit v1.8.0