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/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index e1dc32f..7d726bc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,11 +38,8 @@
@Service
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Autowired
+ @Resource
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- @Autowired
- UpPattenUsageMapper upPattenUsageMapper;
-
@Autowired
DamageService damageService;
@@ -72,11 +70,17 @@
*/
@Override
public List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId) {
- List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>().leftJoin(EdgStorageCageDetails.class, on -> on
- .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
- .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
- .eq(EdgStorageCage::getDeviceId, deviceId));
+ List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCage.class)
+ .selectCollection(EdgStorageCageDetails.class, EdgStorageCageVO::getDetails)
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
+ .eq(EdgStorageCage::getDeviceId, deviceId)
+ .orderByAsc(EdgStorageCage::getSlot)
+ .orderByAsc(EdgStorageCageDetails::getId)
+ );
return storageCageVOS;
}
--
Gitblit v1.8.0