From cb921a68fe5f01012125fb522086acea2aa255ba Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 27 十二月 2024 14:43:40 +0800
Subject: [PATCH] 1、中空理片笼新增配方相关功能，用于用户自定义保存中空线相关参数，避免重复输入相同的参数 2、领取任务/强制出片改造：在流程卡、路线、数量基础上新增配方id，用于关联本地流程卡的中空的参数配方 3、增加限制：同一条线路的同个流程卡仅能存在一个未完成的任务 4、卧式理片笼新增日期格式
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index d7e8364..e9b771b 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -195,7 +195,7 @@
//鎶ュ伐
log.info("灏嗘帴鏀跺埌鐨勭幓鐠冭繘琛岄挗鍖栬嚜鍔ㄦ姤宸ワ紝鐜荤拑id鏈夛細{}", glassIdList);
for (String glass : glassIdList) {
- damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "閽㈠寲", "杩涗腑绌虹悊鐗囩");
+ damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "閽㈠寲", "杩涗腑绌虹悊鐗囩", 1);
}
Map<String, List<GlassInfo>> glassListMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));
@@ -801,7 +801,11 @@
if (totalLayer != 0) {
resultList.add(list.get(0));
HollowBigStorageCage storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
- .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1"));
+ .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON)
+ .le(HollowBigStorageCage::getMinThickness, list.get(0).getThickness())
+ .ge(HollowBigStorageCage::getMaxThickness, list.get(0).getThickness())
+ .eq(HollowBigStorageCage::getRemainWidth, slotWidth)
+ .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
targetSlot = storageCage.getSlot();
hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
.set(HollowBigStorageCage::getRemainWidth, 0).eq(HollowBigStorageCage::getSlot, targetSlot));
--
Gitblit v1.8.0