From 18d0ae927002f73dd0203f2c4d58c33677aa263c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 05 七月 2024 11:44:03 +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 | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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..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
@@ -9,8 +9,13 @@
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;
/**
@@ -24,6 +29,14 @@
@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<>();
@@ -35,11 +48,14 @@
damageSelectWrapper.eq(Damage::getStatus,status);
}
if(workingProcedureId!=0){
- damageSelectWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ 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<>();
@@ -51,16 +67,36 @@
damageUpdateWrapper.eq(Damage::getStatus,status);
}
if(workingProcedureId!=0){
- damageUpdateWrapper.eq(Damage::getWorkingProcedureId,workingProcedureId);
+ damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedureId);
}
Damage damage=new Damage();
damage.setStatus(2);
baseMapper.update(damage,damageUpdateWrapper);
}
+ /**
+ * 娣诲姞鎶ュ伐淇℃伅
+ */
@Override
- public void insertDamage(String glassId){
+ public void insertDamage(Damage damage){
LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper=new LambdaQueryWrapper<>();
- GlassInfo glassInfo=new GlassInfo();
+ 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