From 899813196f304b8e837f0dcff059b0110c82e110 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:07:38 +0800
Subject: [PATCH] Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 018fb44..7a99bed 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -33,6 +33,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* <p>
@@ -61,9 +62,9 @@
@Override
public List<UpPattenUsage> prioritylist() {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
- Engineering engineering= engineeringService.selectInitiate(1);
+ Engineering engineering = engineeringService.selectInitiate(1);
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
- if(engineering!=null){
+ if (engineering != null) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
return this.list(wrapper);
@@ -78,7 +79,7 @@
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
- if(engineering!=null){
+ if (engineering != null) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
if (cell.getState() != null) {
@@ -121,28 +122,28 @@
UpPattenUsage optimizeProject = new UpPattenUsage();
// 灏� Map 涓殑姣忎釜閿�煎鏄犲皠鍒� OptimizeProject 瀵硅薄鐨勭浉搴斿瓧娈典笂
optimizeProject.setEngineeringId(map.getProjectNo());
- optimizeProject.setFilmsId( map.getGlassType());
+ optimizeProject.setFilmsId(map.getGlassType());
optimizeProject.setWidth(map.getWidth());
- optimizeProject.setHeight( map.getHeight());
+ optimizeProject.setHeight(map.getHeight());
optimizeProject.setThickness(map.getGlassThickness());
- optimizeProject.setLayoutSequence( map.getStockId());
+ optimizeProject.setLayoutSequence(map.getStockId());
optimizeProject.setState(0);
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(optimizeProject);
}
}
- log.info("鏌ヨ鍑轰笂鐗囬『搴忛泦鍚堜繚瀛樺埌瀹炰綋绫粄}",resultList);
+ log.info("鏌ヨ鍑轰笂鐗囬『搴忛泦鍚堜繚瀛樺埌瀹炰綋绫粄}", resultList);
return resultList;
}
@Override
public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
- if (CollectionUtil.isEmpty(upPattenUsage)){
+ if (CollectionUtil.isEmpty(upPattenUsage)) {
return;
}
String engineerId = upPattenUsage.get(0).getEngineeringId();
int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
- if (count <=0){
+ if (count <= 0) {
//淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
this.saveBatch(upPattenUsage);
}
@@ -176,7 +177,7 @@
@Override
public void deleteTask(String engineerId) {
QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id",engineerId);
+ wrapper.eq("engineering_id", engineerId);
this.remove(wrapper);
}
@@ -184,9 +185,9 @@
@Override
public UpPattenUsage selectOverTask() {
- QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
- wrapper.gt("state",0)
- .lt("state",99)
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.gt("state", 0)
+ .lt("state", 99)
.last("limit 1");
return this.getOne(wrapper);
}
@@ -194,8 +195,8 @@
@Override
//鑾峰彇鏈�鍚庝竴鍧楃幓鐠�
public UpPattenUsage selectSequence(UpPattenUsage upPattenUsage) {
- QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id",upPattenUsage.getEngineeringId())
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id", upPattenUsage.getEngineeringId())
.orderByDesc("layout_sequence")
.last("limit 1");
return this.getOne(wrapper);
--
Gitblit v1.8.0