From b90de5d0380a48b5ded94540ade05d80f810a9a9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 27 二月 2025 09:22:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 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..34cf57b 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";
@@ -74,11 +74,6 @@
}
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);
}
@@ -317,8 +312,6 @@
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
-
-
String url1 = ERP_URL + "/reportingWork/mesReportingWork";
String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
String url;
@@ -329,7 +322,6 @@
}
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
-
// 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "application/json; utf-8");
@@ -338,9 +330,7 @@
// 鍒涘缓 JSON 瀵硅薄
JSONObject result = new JSONObject();
-
ObjectMapper objectMapper = new ObjectMapper();
-
// 灏� ReportingWork 杞崲涓� JSONObject
// 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
@@ -364,7 +354,7 @@
result.put("qualityInsStatus", 0);
// 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
String jsonInputString = result.toString();
- System.out.println("jsonInputString : " + result);
+ log.info("jsonInputString :{} ", result);
// 鍙戦�佽姹�
try (OutputStream os = con.getOutputStream()) {
byte[] input = jsonInputString.getBytes("utf-8");
@@ -373,7 +363,7 @@
// 鑾峰彇鍝嶅簲鐮�
int responseCode = con.getResponseCode();
- System.out.println("Response Code : " + responseCode);
+ log.info("Response Code :{} ", responseCode);
// 鑾峰彇鍝嶅簲鍐呭
try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))) {
--
Gitblit v1.8.0