From c1f06f52a6b7f3337bacd98feb55aca6af8e6e2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 七月 2024 08:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
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 a9bfa0c..db3ca3a 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
@@ -12,6 +12,7 @@
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.common.config.Const;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -217,17 +218,25 @@
@Override
public void updateRemainWidth(int slot) {
log.info("鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅锛岃绠楁牸瀛愬墿浣欏搴�");
- Integer width = 5000;
- List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
+ double width = 5000;
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper=new LambdaQueryWrapper();
+ bigStorageCageDetailsWrapper
+ .eq(BigStorageCageDetails::getSlot,slot)
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN)
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_ARTIFICIAL);
+
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
- width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
+ double widths=bigStorageCageDetails.getWidth();
+ double gap=bigStorageCageDetails.getGap();
+ width -= widths+gap;
}
//淇敼鏍煎瓙鍓╀綑瀹藉害
BigStorageCage bigStorageCage = new BigStorageCage();
- bigStorageCage.setRemainWidth(width);
+ bigStorageCage.setRemainWidth((int)width);
UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
- bigStorageCageWrapper.eq("remain_width", width);
+ bigStorageCageWrapper.eq("slot", slot);
bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
}
@@ -236,6 +245,10 @@
public List<BigStorageCage> querybigStorageCageDetail(int deviceId) {
LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper =new LambdaQueryWrapper<>();
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper =new LambdaQueryWrapper<>();
+ bigStorageCageDetailsWrapper
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .or()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);
if(deviceId!=0){
bigStorageCageWrapper.eq(BigStorageCage::getDeviceId,deviceId);
bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId,deviceId);
--
Gitblit v1.8.0