From 384698a3568b3ab723843b4e48fdd188c3640aa0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 08 八月 2024 15:51:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 135 ++++++++++++++++++++++++++++++++++----------
1 files changed, 104 insertions(+), 31 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 ab5a1c7..8f87d5a 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,21 +1,27 @@
package com.mes.damage.service.impl;
-import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.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.stream.Collectors;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -24,43 +30,110 @@
@Service
public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
+ @Resource
+ GlassInfoMapper glassInfoMapper;
+ @Resource
+ WorkAssignmentMapper workAssignmentMapper;
+
+ /**
+ * 鏌ヨ鎶ュ伐淇℃伅
+ */
@Override
- public List<Damage> selectDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
- LambdaQueryWrapper<Damage> damageSelectWrapper =new LambdaQueryWrapper<>();
- damageSelectWrapper.between(Damage::getDamageTime,startTime,endTime);
- if (type!=0){
- damageSelectWrapper.eq(Damage::getType,type);
+ 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 (status != 0) {
+ damageSelectWrapper.eq(Damage::getStatus, status);
}
- if(workingProcedureId!=0){
- damageSelectWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ 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(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId){
- LambdaUpdateWrapper<Damage> damageUpdateWrapper=new LambdaUpdateWrapper<>();
- damageUpdateWrapper.between(Damage::getDamageTime,startTime,endTime);
- if (type!=0){
- damageUpdateWrapper.eq(Damage::getType,type);
+ public void submitDamage(List<Damage> damageList) {
+ Map<String, List<Damage>> firstMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
+ + e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
+
+ for (Map.Entry<String, List<Damage>> entry : firstMap.entrySet()) {
+ String key = entry.getKey();
+ List<Damage> damages = entry.getValue();
+
+ System.out.println("Key: " + key);
+
+ Map<String, List<Damage>> secondMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
+ + e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
+
+ for (Map.Entry<String, List<Damage>> entrys : secondMap.entrySet()) {
+
+ }
}
- if (status!=0){
- damageUpdateWrapper.eq(Damage::getStatus,status);
- }
- if(workingProcedureId!=0){
- damageUpdateWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
- }
- Damage damage=new Damage();
- damage.setStatus(2);
- baseMapper.update(damage,damageUpdateWrapper);
+
+
}
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
@Override
- public void insertDamage(String glassId){
- LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>();
- GlassInfo glassInfo=new GlassInfo();
+ 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()));
+ baseMapper.insert(damage);
+ }
+
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
+ @Override
+ public void batchInsertDamage(List<Damage> damageList) {
+ WorkAssignment workAssignment = workAssignmentMapper.selectOne(new LambdaQueryWrapper<WorkAssignment>()
+ .eq(WorkAssignment::getLine, damageList.get(0).getLine())
+ .eq(WorkAssignment::getWorkProcesses, damageList.get(0).getWorkingProcedure()));
+
+ List<String> glassList = damageList.stream().map(Damage::getGlassId).collect(Collectors.toList());
+ List<GlassInfo> glassInfoList = glassInfoMapper.selectList(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassList));
+ Map<String, List<GlassInfo>> listMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));
+ for (Damage damage : damageList) {
+ GlassInfo glassInfo = listMap.get(damage.getGlassId()).get(0);
+ BeanUtils.copyProperties(glassInfo, damage);
+ 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()));
+ }
+ this.saveBatch(damageList);
}
}
--
Gitblit v1.8.0