From b8b5b799e8770d29ac0a5b8530c468d74173c487 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 03 一月 2025 23:22:53 +0800
Subject: [PATCH] 1、手动生成李赛克文件功能已完成、待联调 2、对接除膜机，调整对应的交互 3、中空两条线新增空闲信号，优先李赛克线优先 4、fixbug:指定工程后增加版图id排序，优先炉号从小到大，版序从小到大
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..b916d9e 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
@@ -54,6 +54,9 @@
WorkAssignmentMapper workAssignmentMapper;
+ private final static String ERP_URL = "http://192.168.2.100:8086";
+
+
/**
* 鏌ヨ鎶ュ伐淇℃伅
*/
@@ -163,6 +166,18 @@
reportingWorkDetail.setBreakageQuantity(0);
reportingWorkDetails.add(reportingWorkDetail);
return sendToERP(reportingWork, reportingWorkDetails);
+ }
+
+ @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);
}
/**
@@ -292,7 +307,7 @@
log.info("鎶ュ伐鏁版嵁reportingWork锛歿}锛宺eportingWorkDetails锛歿}", reportingWork, reportingWorkDetails);
try {
// 鐩爣绯荤粺鐨凙PI URL
- String url = "http://192.168.1.199:8086/reportingWork/mesSaveReportingWorkWorn";
+ String url = ERP_URL + "/reportingWork/mesReportingWork";
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -354,7 +369,6 @@
return false;
}
}
-
} catch (Exception e) {
e.printStackTrace();
return false;
--
Gitblit v1.8.0