From 71594bd2dc9201834aa533099e9e49a9b84506cd Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 12 六月 2025 15:32:25 +0800
Subject: [PATCH] 新增韩语
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 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 65ebb37..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
@@ -56,7 +56,6 @@
private final static String ERP_URL = "http://192.168.2.100:8086";
-// private final static String ERP_URL = "http://10.153.19.174:8086";
/**
@@ -75,7 +74,12 @@
if (!"0".equals(workingProcedure)) {
damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
}
- return baseMapper.selectList(damageSelectWrapper);
+ List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
+
+// for (Damage damage : damageList) {
+// damage.setStatus(2);
+// }
+ return damageList;
}
/**
@@ -135,11 +139,20 @@
damageDetails.setResponsibleEquipment(damagesdetails.get(0).getResponsibleEquipment());
damageDetails.setResponsibleTeam(damagesdetails.get(0).getResponsibleTeam());
damageDetails.setResponsiblePersonnel(null);
+ if (damagesdetails.get(0).getStatus() == 7) {
+ damageDetails.setQualityInspector("auto");
+ damageDetails.setPatchStatus(1);
+ damageDetails.setQualityInsStatus(2);
+ } else {
+ damageDetails.setQualityInspector("");
+ damageDetails.setPatchStatus(0);
+ damageDetails.setQualityInsStatus(0);
+ }
damageDetailses.add(damageDetails);
}
}
reportingWorkDetails.add(reportingWorkDetail);
- reportingWorkDetail.setDamageDetailsList(damageDetailses);
+ reportingWorkDetail.setDamageDetails(damageDetailses);
sendToERP(reportingWork, reportingWorkDetails, Boolean.FALSE);
}
}
@@ -181,7 +194,6 @@
damage.setLine(deviceId);
damage.setType(type);
damage.setRemark(remark);
- damage.setStatus(0);
this.insertDamage(damage);
}
@@ -195,6 +207,8 @@
damage1 = baseMapper.selectList(
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 {
@@ -228,12 +242,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);
}
@@ -304,6 +316,7 @@
new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
.in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
+ .lt(Damage::getStatus, 7)
);
}
@@ -312,6 +325,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 +337,7 @@
}
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
// 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "application/json; utf-8");
@@ -330,7 +346,9 @@
// 鍒涘缓 JSON 瀵硅薄
JSONObject result = new JSONObject();
+
ObjectMapper objectMapper = new ObjectMapper();
+
// 灏� ReportingWork 杞崲涓� JSONObject
// 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
@@ -349,12 +367,19 @@
result.put("title", reportingWorkJson);
result.put("type", 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");
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 +388,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