From e8d3676793d4194485afec7940aaf355af594901 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 四月 2024 14:24:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 d6f1b62..6d59152 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
@@ -19,21 +19,23 @@
@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 gay = 50;
//鍐欏叆浠诲姟鍒颁换鍔¤〃
- for (TemperingGlassInfo temperingGlassInfo:temperingGlassInfoList
+ for (TemperingGlassInfo temperingGlassInfo : temperingGlassInfoList
) {
- if((carwidth-gay-temperingGlassInfo.getWidth())>0){
+ if ((carwidth - gay - temperingGlassInfo.getWidth()) > 0) {
//娣诲姞浠诲姟鍒颁换鍔¤〃
- }else{
+ } else {
break;
}
}
}
+ @Override
public List<TemperingGlassInfo> SelectTemperingGlassInfo() {
-
+ return null;
}
}
--
Gitblit v1.8.0