From 3c257eb3bda403d984b50c7f16781c1919b2e74c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 19 十二月 2024 08:23:55 +0800
Subject: [PATCH] 大理片获取可进笼子时过滤满笼的笼子，添加预计调度时间功能
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 522fe22..a4659c7 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,6 +53,7 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
+
/**
* 鏌ヨ鎶ュ伐淇℃伅
*/
@@ -169,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());
@@ -201,7 +210,7 @@
}
if (damage.getType() == 1) {
if (submitReport(damage)) {
- damage.setStatus(2);
+ damage.setStatus(3);
} else {
damage.setStatus(1);
}
@@ -274,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)
);
}
@@ -307,7 +316,7 @@
// 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
result.put("title", reportingWorkJson);
result.put("detail", detailsJsonArray);
- result.put("type", 0);
+ result.put("type", 1);
result.put("userId", "admin");
result.put("userName", "admin");
result.put("qualityInsStatus", 0);
--
Gitblit v1.8.0