From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java
index 731749e..a38036c 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java
@@ -24,6 +24,11 @@
@Service
public class LineConfigurationServiceImpl extends MPJBaseServiceImpl<LineConfigurationMapper, LineConfiguration> implements LineConfigurationService {
+
+ /**
+ * @param machine 褰撳墠璁惧閰嶇疆
+ * @return
+ */
@Override
public LineConfiguration machineLineConfiguration(Machine machine){
List<LineConfiguration> machineLineConfiguration=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
@@ -34,4 +39,51 @@
}
return machineLineConfiguration.get(0);
}
+ /**
+ * @param machine 褰撳墠璁惧鐨勪笂涓�璁惧閰嶇疆
+ * @return
+ */
+ @Override
+ public LineConfiguration machineLineConfigurationBefore(Machine machine){
+ List<LineConfiguration> machineLineConfiguration=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
+ .selectAll(LineConfiguration.class)
+ .eq(LineConfiguration::getMachineId,machine.getId()));
+ if(!machineLineConfiguration.isEmpty()){
+ List<LineConfiguration> machineLineConfigurationBefore=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
+ .selectAll(LineConfiguration.class)
+ .eq(LineConfiguration::getLineId,machineLineConfiguration.get(0).getLineId())
+ .eq(LineConfiguration::getIsStart,1)
+ .lt(LineConfiguration::getProcessSequence,machineLineConfiguration.get(0).getProcessSequence())
+ .orderByDesc(LineConfiguration::getProcessSequence));
+ if (!machineLineConfigurationBefore.isEmpty()){
+ return machineLineConfigurationBefore.get(0);
+ }
+
+ }
+ return null;
+
+ }
+ /**
+ * @param machine 褰撳墠璁惧鐨勪笅涓�璁惧閰嶇疆
+ * @return
+ */
+ @Override
+ public LineConfiguration machineLineConfigurationAfter(Machine machine){
+ List<LineConfiguration> machineLineConfiguration=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
+ .selectAll(LineConfiguration.class)
+ .eq(LineConfiguration::getMachineId,machine.getId()));
+ if(!machineLineConfiguration.isEmpty()){
+ List<LineConfiguration> machineLineConfigurationBefore=baseMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
+ .selectAll(LineConfiguration.class)
+ .eq(LineConfiguration::getLineId,machineLineConfiguration.get(0).getLineId())
+ .eq(LineConfiguration::getIsStart,1)
+ .gt(LineConfiguration::getProcessSequence,machineLineConfiguration.get(0).getProcessSequence())
+ .orderByAsc(LineConfiguration::getProcessSequence));
+ if (!machineLineConfigurationBefore.isEmpty()){
+ return machineLineConfigurationBefore.get(0);
+ }
+
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0