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/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
index 34a06f4..899f474 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -1,10 +1,16 @@
package com.mes.edgglasstask.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +23,62 @@
@Service
public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService {
+ @Resource
+ BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Override
+ public int judgeTasktype(String plcFeedReqLine){
+ LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
+ edgGlassTaskInfoWrapper
+ .eq(EdgGlassTaskInfo::getLine,plcFeedReqLine)
+ .orderByDesc(EdgGlassTaskInfo::getTime);
+ EdgGlassTaskInfo edgGlassTaskInfo=baseMapper.selectOne(edgGlassTaskInfoWrapper);
+ double width=bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine);
+ if(edgGlassTaskInfo.getWidth()<width){
+ return 0;
+ }else{
+ return 1;
+ }
+ }
+
+ @Override
+ public int startTask(){
+
+ double line1Width=bigStorageCageDetailsService.selectGetBoard("1");
+ double line2Width=bigStorageCageDetailsService.selectGetBoard("2");
+
+ LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
+ edgGlassTaskInfoWrapper
+ .eq(EdgGlassTaskInfo::getLine,1)
+ .orderByDesc(EdgGlassTaskInfo::getTime);
+ List<EdgGlassTaskInfo> edgGlassTaskInfoList1=baseMapper.selectList(edgGlassTaskInfoWrapper);
+ int i=0;
+ for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList1
+ ) {
+ if(edgGlassTaskInfo.getWidth()<line1Width){
+ i+=1;
+ line1Width-=edgGlassTaskInfo.getWidth()+20;
+ }
+ }
+ if(i==2){
+ return 2;
+ }
+
+ edgGlassTaskInfoWrapper
+ .eq(EdgGlassTaskInfo::getLine,2)
+ .orderByDesc(EdgGlassTaskInfo::getTime);
+ List<EdgGlassTaskInfo> edgGlassTaskInfoList2=baseMapper.selectList(edgGlassTaskInfoWrapper);
+ i=0;
+ for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList2
+ ) {
+ if(edgGlassTaskInfo.getWidth()<line2Width){
+ i+=1;
+ line2Width-=edgGlassTaskInfo.getWidth()+20;
+ }
+ }
+ if(i==2) {
+ return 1;
+ }else{
+ return 2;
+ }
+ }
}
--
Gitblit v1.8.0