From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 82f96cd..ac51c77 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
@@ -53,10 +53,6 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
- @Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
- return null;
- }
/**
* 鏌ヨ鎶ュ伐淇℃伅
@@ -174,14 +170,22 @@
*/
@Override
public void insertDamage(Damage damage) {
- List<Damage> damage1 = baseMapper.selectList(
- new LambdaQueryWrapper<Damage>()
- .ne(Damage::getType, Const.GLASS_STATE_DAMAGE)
- .ne(Damage::getType, Const.GLASS_STATE_TAKE)
- .eq(Damage::getLine, damage.getLine())
- .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
- .eq(Damage::getGlassId, damage.getGlassId())
- );
+ List<Damage> damage1 = null;
+ if (Const.GLASS_STATE_DAMAGE.equals(damage.getType()) || Const.GLASS_STATE_TAKE.equals(damage.getType())) {
+ damage1 = baseMapper.selectList(
+ new LambdaQueryWrapper<Damage>()
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .eq(Damage::getGlassId, damage.getGlassId())
+ );
+ } else {
+ damage1 = baseMapper.selectList(
+ new LambdaQueryWrapper<Damage>()
+ .notIn(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .eq(Damage::getLine, damage.getLine())
+ .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
+ .eq(Damage::getGlassId, damage.getGlassId())
+ );
+ }
if (damage1 == null || damage1.size() == 0) {
LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
@@ -206,7 +210,7 @@
}
if (damage.getType() == 1) {
if (submitReport(damage)) {
- damage.setStatus(2);
+ damage.setStatus(3);
} else {
damage.setStatus(1);
}
@@ -279,7 +283,7 @@
baseMapper.delete(
new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
- .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
);
}
--
Gitblit v1.8.0