From 74173fd310569a79104bfe1beb97e73890c4cda9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 20 八月 2024 14:10:28 +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 | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 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 8f87d5a..98587bb 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,12 +1,15 @@
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.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.damage.entity.Damage;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
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;
@@ -17,6 +20,7 @@
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -28,7 +32,7 @@
* @since 2024-06-13
*/
@Service
-public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
+public class DamageServiceImpl extends MPJBaseServiceImpl<DamageMapper, Damage> implements DamageService {
@Resource
GlassInfoMapper glassInfoMapper;
@@ -107,33 +111,7 @@
damage.setOrderNumber(glassInfo.getGlassType());
damage.setTechnologyNumber(glassInfo.getLayer());
damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
+ damage.setType(2);
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