From 4cc2295cd3c7a020f623daa7408ed527ebcab943 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 28 二月 2025 08:56:29 +0800
Subject: [PATCH] 1、fixbug:钢化前端报破损异常 2、fixbug:报破损后的数据报工状态显示为0,只有报工状态为1未报工
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 85a1e58..c1e4020 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
@@ -55,7 +55,7 @@
WorkAssignmentMapper workAssignmentMapper;
- private final static String ERP_URL = "http://192.168.2.100:8086";
+ private final static String ERP_URL = "http://192.168.2.100:8086";
// private final static String ERP_URL = "http://10.153.19.174:8086";
@@ -186,7 +186,6 @@
damage.setLine(deviceId);
damage.setType(type);
damage.setRemark(remark);
- damage.setStatus(1);
this.insertDamage(damage);
}
@@ -216,7 +215,7 @@
glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper);
BeanUtils.copyProperties(glassInfo, damage);
- damage.setStatus(1);
+
LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>();
workAssignmentSelectWrapper
.eq(WorkAssignment::getLine, damage.getLine())
@@ -233,12 +232,10 @@
if (damage.getType() == null) {
damage.setType(1);
}
- if (damage.getType() == 1) {
- if (submitReport(damage)) {
- damage.setStatus(3);
- } else {
- damage.setStatus(1);
- }
+ if (damage.getType() == 1 && submitReport(damage)) {
+ damage.setStatus(3);
+ } else {
+ damage.setStatus(1);
}
baseMapper.insert(damage);
}
--
Gitblit v1.8.0