From a6720987358933753d9b90acda9103003cfb37ee Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 13 六月 2025 17:09:57 +0800
Subject: [PATCH] 更新通讯依赖版本为1.5.4，中空大理片，钢化大理片S7，modbus测试完成代码提交
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 28371f7..8cf818c 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,8 +55,7 @@
WorkAssignmentMapper workAssignmentMapper;
- // private final static String ERP_URL = "http://192.168.2.100:8086";
- private final static String ERP_URL = "http://10.153.19.174:8086";
+ private final static String ERP_URL = "http://192.168.2.100:8086";
/**
@@ -209,6 +208,7 @@
new LambdaQueryWrapper<Damage>()
.in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.notIn(Damage::getStatus, 7, 8)
+ .lt(Damage::getStatus, 7)
.eq(Damage::getGlassId, damage.getGlassId())
);
} else {
@@ -316,6 +316,7 @@
new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
.in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
+ .lt(Damage::getStatus, 7)
);
}
@@ -366,10 +367,12 @@
result.put("title", reportingWorkJson);
result.put("type", 0);
- if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
- result.put("isPatch", 1);
- } else {
- result.put("isPatch", 0);
+ if (reportingWorkDetails.get(0).getDamageDetails() != null) {
+ if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
+ result.put("isPatch", 1);
+ } else {
+ result.put("isPatch", 0);
+ }
}
result.put("userId", "admin");
result.put("userName", "admin");
--
Gitblit v1.8.0