From fda645046f5aba969a5d63751878568483ba244d Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 10 三月 2025 10:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 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..28371f7 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,8 @@
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";
+ private final static String ERP_URL = "http://10.153.19.174:8086";
/**
@@ -75,7 +75,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 +140,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 +195,6 @@
damage.setLine(deviceId);
damage.setType(type);
damage.setRemark(remark);
- damage.setStatus(1);
this.insertDamage(damage);
}
@@ -195,6 +208,7 @@
damage1 = baseMapper.selectList(
new LambdaQueryWrapper<Damage>()
.in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .notIn(Damage::getStatus, 7, 8)
.eq(Damage::getGlassId, damage.getGlassId())
);
} else {
@@ -211,7 +225,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 +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);
}
@@ -312,6 +324,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 +336,7 @@
}
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
// 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "application/json; utf-8");
@@ -330,7 +345,9 @@
// 鍒涘缓 JSON 瀵硅薄
JSONObject result = new JSONObject();
+
ObjectMapper objectMapper = new ObjectMapper();
+
// 灏� ReportingWork 杞崲涓� JSONObject
// 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
@@ -349,12 +366,17 @@
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);
+ }
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 +385,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