From 94c5d454d1c30bdea54dabe0843cc935ccb68064 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 四月 2024 14:58:23 +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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 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 4c88df2..ac3ee85 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
@@ -2,9 +2,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.uppattenusage.entity.GlassInfo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* <p>
@@ -16,5 +24,52 @@
*/
@Service
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
+ @Autowired
+ private BigStorageCageMapper bigStorageCageMapper;
+ @Autowired
+ private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
+ @Override
+ public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
+
+
+ //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
+ BigStorageCageDetails layoutSlotInfo =bigStorageCageMapper.SelectTemperingFeedSlot(glassInfo);
+ //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
+ if (layoutSlotInfo!=null) {
+ //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
+ }else{
+ //鑾峰彇涓嶅埌鏃讹細
+
+ //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
+ BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
+ if (EmptySlotInfo!=null){
+ bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+ }else{
+ //鑾峰彇鍏朵粬绗兼牸瀛�-
+ BigStorageCageDetails OtherSlotInfo=bigStorageCageMapper.SelectOtherFeedSlot();
+ bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
+ }
+ //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
+
+ }
+
+ updateRemainWidth(bigStorageCageDetails.getSlot());
+ return bigStorageCageDetails;
+ }
+
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ @Override
+ public void updateRemainWidth(int Slot){
+ //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
+ int width=5000;
+ List<BigStorageCageDetails> bigStorageCageDetailsList= Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
+ for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
+ ) {
+ width-=Integer.parseInt(bigStorageCageDetails.getWidth().toString())+bigStorageCageDetails.getGap();
+ }
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ bigStorageCageMapper.UpdateRemainWidth(Slot,width);
+ }
}
--
Gitblit v1.8.0