From c1f06f52a6b7f3337bacd98feb55aca6af8e6e2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 七月 2024 08:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 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..8d32fb0 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,10 +1,22 @@
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.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.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -17,4 +29,74 @@
@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);
+ }
+ if (status!=0){
+ damageSelectWrapper.eq(Damage::getStatus,status);
+ }
+ if(workingProcedureId!=0){
+ damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
+ }
+ 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);
+ }
+ if (status!=0){
+ damageUpdateWrapper.eq(Damage::getStatus,status);
+ }
+ if(workingProcedureId!=0){
+ damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
+ }
+ Damage damage=new Damage();
+ damage.setStatus(2);
+ baseMapper.update(damage,damageUpdateWrapper);
+ }
+
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
+ @Override
+ public void insertDamage(Damage damage){
+ LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>();
+ glassInfoSelectWrapper.eq(GlassInfo::getGlassId,damage.getGlassId());
+ GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoSelectWrapper);
+
+ LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>();
+ workAssignmentSelectWrapper
+ .eq(WorkAssignment::getLine,damage.getLine())
+ .eq(WorkAssignment::getWorkProcesses,damage.getWorkingProcedure());
+ WorkAssignment workAssignment=workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
+ damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
+ damage.setDeviceName(workAssignment.getDeviceName());
+
+ damage.setEngineerId(glassInfo.getEngineerId());
+ damage.setTemperingLayoutId(glassInfo.getTemperingLayoutId());
+ damage.setProcessId(glassInfo.getFlowCardId());
+ damage.setOrderNumber(glassInfo.getGlassType());
+ damage.setTechnologyNumber(glassInfo.getLayer());
+ damage.setDamageTime(LocalDateTime.now());
+ baseMapper.insert(damage);
+ }
}
--
Gitblit v1.8.0