From b8b5b799e8770d29ac0a5b8530c468d74173c487 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 03 一月 2025 23:22:53 +0800
Subject: [PATCH] 1、手动生成李赛克文件功能已完成、待联调 2、对接除膜机，调整对应的交互 3、中空两条线新增空闲信号，优先李赛克线优先 4、fixbug:指定工程后增加版图id排序，优先炉号从小到大，版序从小到大
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 899f474..97a7cb2 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
@@ -3,7 +3,6 @@
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;
@@ -29,8 +28,8 @@
public int judgeTasktype(String plcFeedReqLine){
LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
edgGlassTaskInfoWrapper
- .eq(EdgGlassTaskInfo::getLine,plcFeedReqLine)
- .orderByDesc(EdgGlassTaskInfo::getTime);
+ .eq(EdgGlassTaskInfo::getLine, plcFeedReqLine)
+ .orderByDesc(EdgGlassTaskInfo::getCreateTime);
EdgGlassTaskInfo edgGlassTaskInfo=baseMapper.selectOne(edgGlassTaskInfoWrapper);
double width=bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine);
if(edgGlassTaskInfo.getWidth()<width){
@@ -48,8 +47,8 @@
LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
edgGlassTaskInfoWrapper
- .eq(EdgGlassTaskInfo::getLine,1)
- .orderByDesc(EdgGlassTaskInfo::getTime);
+ .eq(EdgGlassTaskInfo::getLine, 1)
+ .orderByDesc(EdgGlassTaskInfo::getCreateTime);
List<EdgGlassTaskInfo> edgGlassTaskInfoList1=baseMapper.selectList(edgGlassTaskInfoWrapper);
int i=0;
for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList1
@@ -64,8 +63,8 @@
}
edgGlassTaskInfoWrapper
- .eq(EdgGlassTaskInfo::getLine,2)
- .orderByDesc(EdgGlassTaskInfo::getTime);
+ .eq(EdgGlassTaskInfo::getLine, 2)
+ .orderByDesc(EdgGlassTaskInfo::getCreateTime);
List<EdgGlassTaskInfo> edgGlassTaskInfoList2=baseMapper.selectList(edgGlassTaskInfoWrapper);
i=0;
for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList2
--
Gitblit v1.8.0