From f62353986a6afff2e2a5a17cfdec30d04a4e600d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 07 十二月 2024 16:50:09 +0800
Subject: [PATCH] 1、fixbug:缺片详情临时解决 将所有缺片信息返回 2、新增膜系 状态：避免同一块玻璃占用完相同尺寸关系表 3、中空界面注释开始暂停按钮 4、领取/强制执行任务增加限制，必须在本条线没有任务的情况下可以领取
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
index 16c4a41..e110c40 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.mes.hollow.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
@@ -67,6 +68,11 @@
log.info("璇ユ祦绋嬪崱淇℃伅绯荤粺鏈壘鍒�");
return info;
}
+ List<HollowGlassOutRelationInfo> outRelationInfos = this.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>().eq(HollowGlassOutRelationInfo::getCell, cell)
+ .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
+ if (CollectionUtil.isNotEmpty(outRelationInfos)){
+ return null;
+ }
info.setFlowCardId(flowCardId);
info.setCell(cell);
info.setIsForce(isForce);
--
Gitblit v1.8.0