From 8b24fb7dc4040372e4e785e96ea8eb487cf65207 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
index 711aedf..2a805b0 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
@@ -1,9 +1,12 @@
package com.mes.hollowqueue.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
@@ -14,6 +17,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Optional;
/**
* (HollowGlassQueueInfo)琛ㄦ湇鍔″疄鐜扮被
@@ -28,7 +32,8 @@
@Resource
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
-
+ @Resource
+ DamageService damageService;
@Override
@@ -38,5 +43,66 @@
.orderByAsc(HollowGlassQueueInfo::getHollowSequence)
.orderByAsc(HollowGlassQueueInfo::getLayer));
}
+
+ @Override
+ public List<HollowGlassQueueInfo> queryHollowGlassQueueInfoByLine(int cell) {
+ List<String> relationIds = this.listObjs(
+ new LambdaQueryWrapper<HollowGlassQueueInfo>()
+ .lt(HollowGlassQueueInfo::getState, 1)
+ .eq(HollowGlassQueueInfo::getCell, cell)
+ .select(HollowGlassQueueInfo::getRelationId)
+ .groupBy(HollowGlassQueueInfo::getRelationId),
+ Object::toString
+ );
+ List<HollowGlassQueueInfo> resultList = this.list(
+ new QueryWrapper<HollowGlassQueueInfo>()
+ .in("relation_id", relationIds)
+ .eq("cell", cell)
+ .eq("is_pair", 1)
+ .select("width","height","flow_card_id","relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
+ .groupBy("relation_id", "hollow_sequence")
+ .orderByAsc("relation_id", "hollow_sequence")
+ );
+
+ // 淇敼鍐呭瓨涓泦鍚堢殑绗竴鏉� state 涓� 0 鎴� -1 鐨勫璞＄殑 state 涓� -2
+ for (HollowGlassQueueInfo item : resultList) {
+ if (item.getState() == 0 || item.getState() == -1) {
+ item.setState(-2);
+ break; // 鍙敼绗竴鏉★紝鏀瑰畬灏遍��鍑哄惊鐜�
+ }
+ }
+ return resultList;
+ }
+
+ @Override
+ public void confirmBorder(HollowGlassQueueInfo hollowGlassQueueInfo) {
+
+ if (hollowGlassQueueInfo.getState() == 8) {
+ HollowGlassQueueInfo hollowGlassQueueInfoDamage = this.getOne(
+ new LambdaQueryWrapper<HollowGlassQueueInfo>()
+ .eq(HollowGlassQueueInfo::getLayer, hollowGlassQueueInfo.getLayer())
+ .eq(HollowGlassQueueInfo::getRelationId, hollowGlassQueueInfo.getRelationId())
+ .eq(HollowGlassQueueInfo::getHollowSequence, hollowGlassQueueInfo.getHollowSequence())
+ );
+ hollowGlassQueueInfoDamage.setState(hollowGlassQueueInfo.getState());
+ this.updateById(hollowGlassQueueInfoDamage);
+ Damage damage = new Damage();
+ damage.setGlassId(hollowGlassQueueInfoDamage.getGlassId());
+ damage.setLine(hollowGlassQueueInfoDamage.getCell());
+ damage.setWorkingProcedure("涓┖");
+ damage.setRemark("鎶橀摑妗�");
+ damage.setStatus(1);
+ damage.setType(hollowGlassQueueInfoDamage.getState());
+ damageService.insertDamage(damage);
+ } else {
+ this.update(
+ new LambdaUpdateWrapper<HollowGlassQueueInfo>()
+ .set(HollowGlassQueueInfo::getState, hollowGlassQueueInfo.getState())
+ .eq(HollowGlassQueueInfo::getRelationId, hollowGlassQueueInfo.getRelationId())
+ .eq(HollowGlassQueueInfo::getHollowSequence, hollowGlassQueueInfo.getHollowSequence())
+ );
+
+ }
+ }
}
--
Gitblit v1.8.0