From 423be99a16b2f5fa521651dbb0cebec82cb15531 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 12 四月 2024 15:18:20 +0800
Subject: [PATCH] 代码迁移
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 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 ac3ee85..3f6a430 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
@@ -1,22 +1,23 @@
package com.mes.bigstorage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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 com.mes.glassinfo.entity.GlassInfo;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
+import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
+
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -24,30 +25,47 @@
*/
@Service
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
- @Autowired
+ @Resource
private BigStorageCageMapper bigStorageCageMapper;
- @Autowired
+ @Resource
private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
+
@Override
public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
- //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
- BigStorageCageDetails layoutSlotInfo =bigStorageCageMapper.SelectTemperingFeedSlot(glassInfo);
- //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
- if (layoutSlotInfo!=null) {
+ //1銆佹煡璇㈢悊鐗囩鍐呯幓鐠冪墖搴忕瓑浜庡綋鍓嶇幓鐠冪墖搴�-1鐨勭幓鐠�
+ LambdaQueryWrapper<BigStorageCageDetails> wapper = new LambdaQueryWrapper<>();
+ wapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
+ BigStorageCageDetails layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(wapper);
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
+ bigStorageCageDetails.setGlassId(bigStorageCageDetails.getGlassId());
+ bigStorageCageDetails.setFlowCardId(glassInfo.getFlowcardId());
+ bigStorageCageDetails.setGlassType(glassInfo.getGlassType());
+ bigStorageCageDetails.setWidth(glassInfo.getWidth());
+ bigStorageCageDetails.setHeight(glassInfo.getHeight());
+ bigStorageCageDetails.setThickness(glassInfo.getThickness());
+ bigStorageCageDetails.setTemperingLayoutId(glassInfo.getTemperingLayoutId());
+ bigStorageCageDetails.setTemperingFeedSequence(glassInfo.getTemperingFeedSequence());
+
+
+ //2銆佹湁绗﹀悎鏉′欢鐨勬牸瀛愭椿鐗囧簭涓�1鏃�
+ if (layoutSlotInfo.getSlot() != null ) {
//灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
- bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
- }else{
+
+
+ bigStorageCageDetailsMapper.updateById(bigStorageCageDetails);
+ } else {
//鑾峰彇涓嶅埌鏃讹細
//鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
- BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
- if (EmptySlotInfo!=null){
+ BigStorageCageDetails EmptySlotInfo = bigStorageCageMapper.SelectEmptyFeedSlot();
+ if (EmptySlotInfo != null) {
bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
- }else{
+ } else {
//鑾峰彇鍏朵粬绗兼牸瀛�-
- BigStorageCageDetails OtherSlotInfo=bigStorageCageMapper.SelectOtherFeedSlot();
+ BigStorageCageDetails OtherSlotInfo = bigStorageCageMapper.SelectOtherFeedSlot();
bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
}
//灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
@@ -60,16 +78,16 @@
//淇敼鏍煎瓙鍓╀綑瀹藉害
@Override
- public void updateRemainWidth(int Slot){
+ public void updateRemainWidth(int Slot) {
//鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
- int width=5000;
- List<BigStorageCageDetails> bigStorageCageDetailsList= Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
- for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
+ int width = 5000;
+ List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
- width-=Integer.parseInt(bigStorageCageDetails.getWidth().toString())+bigStorageCageDetails.getGap();
+ width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
}
//淇敼鏍煎瓙鍓╀綑瀹藉害
- bigStorageCageMapper.UpdateRemainWidth(Slot,width);
+ bigStorageCageMapper.UpdateRemainWidth(Slot, width);
}
}
--
Gitblit v1.8.0