From d799fbde44cc568a3e15d78dc6e582ff244ffa89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 三月 2025 16:05:44 +0800
Subject: [PATCH] 1、卧式理片重置任务调整，避免无任务情况下无法将任务交互表的数据清掉 2、中空领取任务界面新增产品名称，便于识别产品 3、调整部分定时任务间隔时间 4、定时任务分隔开，按照两个/多个界面的websocket由一个分为多个 5、取消钢化功能开发中z
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java
index 46ed774..45774e9 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java
@@ -49,7 +49,7 @@
.like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
.like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
- .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
+// .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
.orderByAsc(HollowBigStorageCage::getDeviceId)
.orderByAsc(HollowBigStorageCage::getSlot);
return baseMapper.selectJoinList(HollowBigStorageAndDetailsDTO.class, wrapper);
@@ -82,7 +82,7 @@
// 2灏嗙┖鏍煎瓙鐨勫昂瀵哥疆涓哄垵濮嬪昂瀵�
this.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
.set(HollowBigStorageCage::getRemainWidth, slotWidth)
- .notIn(HollowBigStorageCage::getSlot, "select distinct slot from hollow_big_storage_cage_details where state in( 100 , 102 , 103 ,104)"));
+ .notInSql(HollowBigStorageCage::getSlot, "select distinct slot from hollow_big_storage_cage_details where state in( 100 , 102 , 103 ,104)"));
// 3銆佸皢涓嶅湪绗煎唴鐨勬祦绋嬪崱鐨勫叧绯昏〃閲嶇疆
// 浠呰幏鍙栫悊鐗囩鍐呯殑娴佺▼鍗′俊鎭伩鍏嶇幓鐠�
List<FlowCardVirtualSlotDTO> list = hollowBigStorageCageDetailsService.queryFlowCardIdsAndLayer();
--
Gitblit v1.8.0