From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index 4bb7aa3..202a852 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -9,9 +10,11 @@
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
/**
@@ -29,13 +32,14 @@
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
- log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
+ //灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
+ .or(qw -> qw.eq(OptimizeProject::getState, 200))
.like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
//.groupBy(OptimizeProject::getProjectNo)
;
- log.info("杩斿洖宸ョ▼淇℃伅");
+ //杩斿洖宸ョ▼淇℃伅
return this.list(wrapper);
}
@@ -50,6 +54,25 @@
}
+ @Override
+ public boolean overTask(UpPattenUsage sequence, int state) {
+ if(sequence.getState()==100){
+ UpdateWrapper<OptimizeProject> wrapper=new UpdateWrapper<>();
+ wrapper.eq("project_no",sequence.getEngineeringId())
+ .set("state",state);
+ boolean updateSuccess = this.update(wrapper);
+ log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}",updateSuccess);
+ }
+ return false;
+ }
+
+ @Override
+ public List<OptimizeProject> getDoingTask() {
+ QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
+ wrapper.select("project_no,project_name")
+ .eq("state",200);
+ return this.list(wrapper);
+ }
}
--
Gitblit v1.8.0