From 4644a64be87033d1569e43cc672ed9c777eae43b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 18 二月 2025 14:49:17 +0800
Subject: [PATCH] 添加架子复位接口与定时任务
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 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 ac51c77..4550d65 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
@@ -19,6 +19,7 @@
import com.mes.work_assignment.entity.WorkAssignment;
import com.mes.work_assignment.mapper.WorkAssignmentMapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -52,6 +53,10 @@
GlassInfoMapper glassInfoMapper;
@Resource
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";
/**
@@ -93,7 +98,12 @@
reportingWork.setOrderId(damages.get(0).getProcessId().substring(0, 10));
reportingWork.setProductionId(damages.get(0).getProcessId().substring(0, 11));
reportingWork.setProcessId(damages.get(0).getProcessId() + "/" + damages.get(0).getTechnologyNumber());
- reportingWork.setDeviceName(damages.get(0).getDeviceName());
+// reportingWork.setDeviceName(damages.get(0).getDeviceName());
+ if (StringUtils.isBlank(damages.get(0).getDeviceName())) {
+ reportingWork.setDeviceName("auto");
+ } else {
+ reportingWork.setDeviceName(damages.get(0).getDeviceName());
+ }
reportingWork.setThisProcess(damages.get(0).getWorkingProcedure());
reportingWork.setThisCompletedQuantity(0);
reportingWork.setThisWornQuantity(0);
@@ -135,7 +145,7 @@
}
reportingWorkDetails.add(reportingWorkDetail);
reportingWorkDetail.setDamageDetailsList(damageDetailses);
- sendToERP(reportingWork, reportingWorkDetails);
+ sendToERP(reportingWork, reportingWorkDetails, Boolean.FALSE);
}
}
@@ -145,9 +155,12 @@
reportingWork.setOrderId(damage.getProcessId().substring(0, 10));
reportingWork.setProductionId(damage.getProcessId().substring(0, 11));
reportingWork.setProcessId(damage.getProcessId() + "/" + damage.getTechnologyNumber());
- reportingWork.setDeviceName(damage.getDeviceName());
+ if (StringUtils.isBlank(damage.getDeviceName())) {
+ reportingWork.setDeviceName("auto");
+ } else {
+ reportingWork.setDeviceName(damage.getDeviceName());
+ }
reportingWork.setThisProcess(damage.getWorkingProcedure());
-// reportingWork.setNextProcess("纾ㄨ竟");
reportingWork.setThisCompletedQuantity(1);
reportingWork.setThisWornQuantity(0);
reportingWork.setClasses("鏃╃彮");
@@ -162,7 +175,19 @@
reportingWorkDetail.setCompletedQuantity(1);
reportingWorkDetail.setBreakageQuantity(0);
reportingWorkDetails.add(reportingWorkDetail);
- return sendToERP(reportingWork, reportingWorkDetails);
+ return sendToERP(reportingWork, reportingWorkDetails, Boolean.TRUE);
+ }
+
+ @Override
+ public void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
+ Damage damage = new Damage();
+ damage.setGlassId(glassId);
+ damage.setWorkingProcedure(workingProcedure);
+ damage.setLine(deviceId);
+ damage.setType(type);
+ damage.setRemark(remark);
+ damage.setStatus(0);
+ this.insertDamage(damage);
}
/**
@@ -288,11 +313,20 @@
}
@Override
- public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails) {
+ public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type) {
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
- String url = "http://192.168.1.199:8086/reportingWork/mesSaveReportingWorkWorn";
+
+
+ String url1 = ERP_URL + "/reportingWork/mesReportingWork";
+ String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
+ String url;
+ if (type) {
+ url = url1;
+ } else {
+ url = url2;
+ }
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -308,19 +342,26 @@
ObjectMapper objectMapper = new ObjectMapper();
// 灏� ReportingWork 杞崲涓� JSONObject
+
+ // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
+
+ if (type) {
+ JSONObject detailsJsonObject = new JSONObject(objectMapper.writeValueAsString(reportingWorkDetails.get(0)));
+ result.put("detail", detailsJsonObject);
+ reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14));
+ } else {
+ JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
+ result.put("detail", detailsJsonArray);
+ }
JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork));
reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
- // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
- JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
-
// 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
result.put("title", reportingWorkJson);
- result.put("detail", detailsJsonArray);
+
result.put("type", 0);
result.put("userId", "admin");
result.put("userName", "admin");
result.put("qualityInsStatus", 0);
-
// 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
String jsonInputString = result.toString();
System.out.println("jsonInputString : " + result);
@@ -347,14 +388,13 @@
// 鎻愬彇 code 鍜� message
int code = jsonResponse.getInt("code");
String message = jsonResponse.getStr("data");
- log.info("鎶ュ伐澶辫触锛歿},{}", code, message);
+ log.info("鎶ュ伐鎯呭喌锛歿},{}", code, message);
if (code == 200 && message.equals("true")) {
return true;
} else {
return false;
}
}
-
} catch (Exception e) {
e.printStackTrace();
return false;
--
Gitblit v1.8.0