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 | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 34cf57b..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
@@ -75,6 +75,11 @@
if (!"0".equals(workingProcedure)) {
damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
}
+ List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
+
+ for (Damage damage : damageList) {
+ damage.setStatus(2);
+ }
return baseMapper.selectList(damageSelectWrapper);
}
@@ -181,7 +186,6 @@
damage.setLine(deviceId);
damage.setType(type);
damage.setRemark(remark);
- damage.setStatus(1);
this.insertDamage(damage);
}
@@ -211,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())
@@ -228,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);
}
@@ -312,6 +314,8 @@
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
+
+
String url1 = ERP_URL + "/reportingWork/mesReportingWork";
String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
String url;
@@ -322,6 +326,7 @@
}
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
// 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "application/json; utf-8");
@@ -330,7 +335,9 @@
// 鍒涘缓 JSON 瀵硅薄
JSONObject result = new JSONObject();
+
ObjectMapper objectMapper = new ObjectMapper();
+
// 灏� ReportingWork 杞崲涓� JSONObject
// 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
@@ -354,7 +361,7 @@
result.put("qualityInsStatus", 0);
// 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
String jsonInputString = result.toString();
- log.info("jsonInputString :{} ", result);
+ System.out.println("jsonInputString : " + result);
// 鍙戦�佽姹�
try (OutputStream os = con.getOutputStream()) {
byte[] input = jsonInputString.getBytes("utf-8");
@@ -363,7 +370,7 @@
// 鑾峰彇鍝嶅簲鐮�
int responseCode = con.getResponseCode();
- log.info("Response Code :{} ", responseCode);
+ System.out.println("Response Code : " + responseCode);
// 鑾峰彇鍝嶅簲鍐呭
try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))) {
--
Gitblit v1.8.0