From 134c3849c93a849863ae2a7b7013fe04fc554b27 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 五月 2024 14:30:53 +0800
Subject: [PATCH] 1、卧式理片笼线程改造：新增层数 总层数 详情表增加工程id 按照玻璃尺寸、膜系、层数、工程等交换玻璃信息 2、websocket漏提代码
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index fd2bdf0..4e4b1c8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -1,9 +1,11 @@
package com.mes.temperingglass.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -16,24 +18,30 @@
* @author zhoush
* @since 2024-03-27
*/
+@Slf4j
@Service
public class TemperingGlassInfoServiceImpl extends ServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
+ @Override
public void addOutTask(List<TemperingGlassInfo> temperingGlassInfoList) {
- double carwidth=5000;
- double gay=50;
+ double carWidth=5000;
+ double gap=50;
//鍐欏叆浠诲姟鍒颁换鍔¤〃
for (TemperingGlassInfo temperingGlassInfo:temperingGlassInfoList
) {
- if((carwidth-gay-temperingGlassInfo.getWidth())>0){
- //娣诲姞浠诲姟鍒颁换鍔¤〃
+ log.info("1銆佸綋鍑虹墖杞﹀搴﹀ぇ浜庣幓鐠冨搴︽椂");
+ if((carWidth-temperingGlassInfo.getWidth())>0){
+ carWidth-=temperingGlassInfo.getWidth()-gap;
+ log.info("2銆佹坊鍔犲垰灏忕墖琛ㄤ俊鎭埌浠诲姟琛�");
+ temperingGlassInfo.setState(1);
+ baseMapper.updateById(temperingGlassInfo);
+ log.info("3銆佹坊鍔犲垰灏忕墖琛ㄤ俊鎭埌浠诲姟琛�");
+ BigStorageCageOutTask bigStorageCageOutTask =new BigStorageCageOutTask();
+ bigStorageCageOutTask.setId(temperingGlassInfo.getId());
}else{
break;
}
}
}
- public List<TemperingGlassInfo> SelectTemperingGlassInfo() {
- return null;
- }
}
--
Gitblit v1.8.0