From d940d0b4c0e7d6fcebfb0fea2bed1c514e1f796f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java |   49 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index bce5186..aca1402 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -56,6 +56,18 @@
     @Value("${mes.minCount}")
     private int minCount;
 
+    @Value("${mes.carWidth}")
+    private Integer carWidth;
+
+    @Value("${mes.slotWidth}")
+    private Integer slotWidth;
+
+    @Value("${mes.carMaxSize}")
+    private Integer carMaxSize;
+
+    @Value("${mes.galssGap}")
+    private Integer galssGap;
+
     /**
      * 鏌ヨ杩�/鍑虹墖浠诲姟
      */
@@ -69,7 +81,7 @@
             List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
 
             LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
-            feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState,Const.BIG_STORAGE_IN_SLOT);
+            feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT);
             List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
 
             Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
@@ -87,7 +99,7 @@
             List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
 
             LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
-            outTaskWrapper.lt(BigStorageCageOutTask::getTaskState,Const.BIG_STORAGE_OUT_SUCCESS);
+            outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
             List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
 
             Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
@@ -125,7 +137,7 @@
         for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
         ) {
             if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
-                carWidth -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
+                carWidth = carWidth - bigStorageCageDetails.getWidth() - galssGap;
             }
         }
         return carWidth;
@@ -142,7 +154,7 @@
 
     //鐞嗙墖绗艰鎯呯牬鎹�
     @Override
-    public void damageBigStorageCageDetails(String glassId,int status) {
+    public void damageBigStorageCageDetails(String glassId, int status) {
 
         LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
         temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId);
@@ -152,15 +164,16 @@
         bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
         BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
 
-        if(temperingGlassInfo!=null){
-            if(status==0){
+        if (temperingGlassInfo != null) {
+            if (status == 0) {
                 temperingGlassInfo.setState(Const.TEMPERING_DAMAGE);
-            }else{
+            } else {
                 temperingGlassInfo.setState(Const.TEMPERING_TAKE);
             }
             temperingGlassInfoMapper.updateById(temperingGlassInfo);
         }
-        baseMapper.deleteById(bigStorageCageDetails.getId());
+        bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
+        baseMapper.updateById(bigStorageCageDetails);
         bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
         //todo:鎻掑叆鐮存崯鏁版嵁
 
@@ -168,15 +181,19 @@
 
     //鏌ヨ鐜荤拑淇℃伅
     @Override
-    public BigStorageCageDetails selectBigStorageCageDetails(String glassId) {
+    public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
         LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
         glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
         GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
         BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
-        BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
-        bigStorageCageDetails.setState(0);
-        bigStorageCageDetails.setGap(Const.BIG_STORAGE_GAP);
-        return bigStorageCageDetails;
+        if(glassInfo!=null){
+            BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+            bigStorageCageDetails.setState(0);
+            bigStorageCageDetails.setGap(galssGap);
+        }
+        List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>();
+        bigStorageCageDetailsList.add(bigStorageCageDetails);
+        return bigStorageCageDetailsList;
     }
 
     //鐞嗙墖绗艰鎯呮坊鍔�
@@ -189,7 +206,7 @@
     //鐞嗙墖绗艰鎯呭畬鎴�
     @Override
     public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
-        if (bigStorageCageDetails.getBigStorageCageFeedTask()!=null) {
+        if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
             bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
             baseMapper.updateById(bigStorageCageDetails);
         } else {
@@ -228,7 +245,7 @@
             return bigStorageDTO;
         }
         bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
-                .eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
+                .eq(BigStorageCage::getRemainWidth, slotWidth)
                 .inSql(BigStorageCage::getDeviceId,
                         "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
                 .last("limit 1"));
@@ -239,7 +256,7 @@
             return bigStorageDTO;
         }
         bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
-                .eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
+                .eq(BigStorageCage::getRemainWidth, slotWidth)
                 .last("limit 1"));
         Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
         bigStorageDTO = new BigStorageDTO();

--
Gitblit v1.8.0