From 32ccf7594204fe2c47e76b7569d73bde15b34d54 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 02 八月 2024 14:08:38 +0800
Subject: [PATCH] 修改报工新增数据方法
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 191 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 189 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 130e515..36624b9 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -1,14 +1,30 @@
package com.mes.damage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.damage.entity.Damage;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.mes.work_assignment.mapper.WorkAssignmentMapper;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -17,4 +33,175 @@
@Service
public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
+ @Resource
+ GlassInfoMapper glassInfoMapper;
+ @Resource
+ WorkAssignmentMapper workAssignmentMapper;
+
+ /**
+ * 鏌ヨ鎶ュ伐淇℃伅
+ */
+ @Override
+ public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
+ LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
+ damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
+ if (type != 0) {
+ damageSelectWrapper.eq(Damage::getType, type);
+ }
+ if (status != 0) {
+ damageSelectWrapper.eq(Damage::getStatus, status);
+ }
+ if (!"0".equals(workingProcedure)) {
+ damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
+ }
+ List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
+
+ for (Damage damage : damageList) {
+ damage.setStatus(2);
+ }
+ return baseMapper.selectList(damageSelectWrapper);
+ }
+
+ /**
+ * 鎻愪氦鎶ュ伐
+ */
+ @Override
+ public void submitDamage(List<Damage> damageList) {
+ Map<String, Map<String, Map<String, Map<String, List<Damage>>>>> resultMap = damageList.stream()
+ .collect(Collectors.groupingBy(
+ Damage::getProcessId,
+ Collectors.groupingBy(
+ Damage::getWorkingProcedure,
+ Collectors.groupingBy(
+ Damage::getDeviceName,
+ Collectors.groupingBy(Damage::getTeamsGroupsName)
+ )
+ )
+ ));
+ // 閬嶅巻 resultMap
+ for (Map.Entry<String, Map<String, Map<String, Map<String, List<Damage>>>>> processEntry : resultMap.entrySet()) {
+ String processId = processEntry.getKey();
+ System.out.println("ProcessId: " + processId);
+
+ // 鑾峰彇绗簩灞傜殑 Map锛屾寜 workingProcedure 鍒嗙粍鐨勭粨鏋�
+ Map<String, Map<String, Map<String, List<Damage>>>> workingProcedureMap = processEntry.getValue();
+
+ // 閬嶅巻 workingProcedureMap
+ for (Map.Entry<String, Map<String, Map<String, List<Damage>>>> workingProcedureEntry : workingProcedureMap.entrySet()) {
+ String workingProcedure = workingProcedureEntry.getKey();
+ System.out.println(" WorkingProcedure: " + workingProcedure);
+
+ // 鑾峰彇绗笁灞傜殑 Map锛屾寜 deviceName 鍒嗙粍鐨勭粨鏋�
+ Map<String, Map<String, List<Damage>>> deviceNameMap = workingProcedureEntry.getValue();
+
+ // 閬嶅巻 deviceNameMap
+ for (Map.Entry<String, Map<String, List<Damage>>> deviceNameEntry : deviceNameMap.entrySet()) {
+ String deviceName = deviceNameEntry.getKey();
+ System.out.println(" DeviceName: " + deviceName);
+
+ // 鑾峰彇绗洓灞傜殑 Map锛屾寜 teamsGroupsName 鍒嗙粍鐨勭粨鏋�
+ Map<String, List<Damage>> teamsGroupsNameMap = deviceNameEntry.getValue();
+
+ // 閬嶅巻 teamsGroupsNameMap
+ for (Map.Entry<String, List<Damage>> teamsGroupsNameEntry : teamsGroupsNameMap.entrySet()) {
+ String teamsGroupsName = teamsGroupsNameEntry.getKey();
+ System.out.println(" TeamsGroupsName: " + teamsGroupsName);
+
+ // 鑾峰彇 Damage 鍒楄〃
+ List<Damage> damageListForTeamsGroupsName = teamsGroupsNameEntry.getValue();
+ //鎶ュ伐涓昏〃鏁版嵁
+ ReportingWork reportingWork = new ReportingWork();
+ reportingWork.setProcessId(processId);
+ reportingWork.setThisProcess(workingProcedure);
+ reportingWork.setDeviceName(deviceName);
+ reportingWork.setTeamsGroupsName(teamsGroupsName);
+
+ Map<Integer, Map<Integer, Map<String, List<Damage>>>> groupedByOrderTechBreakage = damageListForTeamsGroupsName.stream()
+ .map(damage -> Optional.ofNullable(damage)) // 浣跨敤Optional澶勭悊鍙兘涓簄ull鐨勫厓绱�
+ .filter(Optional::isPresent) // 杩囨护鎺夌┖鐨凮ptional
+ .map(Optional::get) // 鑾峰彇闈炵┖鐨凞amage瀵硅薄
+ .collect(Collectors.groupingBy(
+ damage -> Optional.ofNullable(damage.getOrderNumber()).orElse(0), // 浣跨敤orElse璁剧疆榛樿鍊硷紝浠ュ鐞唍ull鍊�
+ Collectors.groupingBy(
+ damage -> Optional.ofNullable(damage.getTechnologyNumber()).orElse(0), // 鍚屾牱澶勭悊technologyNumber鍙兘涓簄ull鐨勬儏鍐�
+ Collectors.groupingBy(
+ damage -> Optional.ofNullable(damage.getBreakageType()).orElse("Unknown"), // 澶勭悊breakageType鍙兘涓簄ull鐨勬儏鍐�
+ Collectors.toList()
+ )
+ )
+ ));
+
+ // 閬嶅巻 groupedByOrderTechBreakage
+ for (Map.Entry<Integer, Map<Integer, Map<String, List<Damage>>>> orderEntry : groupedByOrderTechBreakage.entrySet()) {
+ Integer orderNumber = orderEntry.getKey();
+ System.out.println(" OrderNumber: " + orderNumber);
+
+ // 鑾峰彇绗簩灞傜殑 Map锛屾寜 technologyNumber 鍒嗙粍鐨勭粨鏋�
+ Map<Integer, Map<String, List<Damage>>> technologyNumberMap = orderEntry.getValue();
+
+ // 閬嶅巻 technologyNumberMap
+ for (Map.Entry<Integer, Map<String, List<Damage>>> technologyEntry : technologyNumberMap.entrySet()) {
+ Integer technologyNumber = technologyEntry.getKey();
+ System.out.println(" TechnologyNumber: " + technologyNumber);
+
+ // 鑾峰彇绗笁灞傜殑 Map锛屾寜 breakageType 鍒嗙粍鐨勭粨鏋�
+ Map<String, List<Damage>> breakageTypeMap = technologyEntry.getValue();
+
+ // 閬嶅巻 breakageTypeMap
+ for (Map.Entry<String, List<Damage>> breakageTypeEntry : breakageTypeMap.entrySet()) {
+ String breakageType = breakageTypeEntry.getKey();
+ System.out.println(" BreakageType: " + breakageType);
+
+
+ // 鑾峰彇 Damage 鍒楄〃
+ List<Damage> damageListForBreakageType = breakageTypeEntry.getValue();
+ int completedQuantity = 0;
+ int breakageQuantity = 0;
+ // 閬嶅巻 Damage 鍒楄〃
+ for (Damage damage : damageListForBreakageType) {
+ // 鎵撳嵃鎴栧鐞嗘瘡涓� Damage 瀵硅薄
+ System.out.println(" Damage: " + damage.toString());
+ if (damage.getType() == 1) {
+ completedQuantity += 1;
+ } else if (damage.getType() == 2) {
+ breakageQuantity += 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ }
+
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
+ @Override
+ public void insertDamage(Damage damage) {
+ LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
+ glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
+ GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper);
+ BeanUtils.copyProperties(glassInfo, damage);
+
+ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>();
+ workAssignmentSelectWrapper
+ .eq(WorkAssignment::getLine, damage.getLine())
+ .eq(WorkAssignment::getWorkProcesses, damage.getWorkingProcedure());
+ WorkAssignment workAssignment = workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
+ if (workAssignment != null) {
+ damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
+ damage.setDeviceName(workAssignment.getDeviceName());
+ }
+ damage.setProcessId(glassInfo.getFlowCardId());
+ damage.setOrderNumber(glassInfo.getGlassType());
+ damage.setTechnologyNumber(glassInfo.getLayer());
+ damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
+ damage.setType(2);
+ baseMapper.insert(damage);
+ }
}
--
Gitblit v1.8.0