From 7742c87a5de7e49eaeab705510759cfd6b039617 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 07 一月 2025 11:01:10 +0800
Subject: [PATCH] 1、前端推送数据新增两条线空闲信号用于前端展示
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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..61f6836 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,9 @@
GlassInfoMapper glassInfoMapper;
@Resource
WorkAssignmentMapper workAssignmentMapper;
+
+
+ private final static String ERP_URL = "http://192.168.2.100:8086";
/**
@@ -93,7 +97,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);
@@ -145,9 +154,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("鏃╃彮");
@@ -163,6 +175,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 +316,8 @@
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";
+ String url = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
URL obj = new URL(url);
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -354,7 +379,6 @@
return false;
}
}
-
} catch (Exception e) {
e.printStackTrace();
return false;
--
Gitblit v1.8.0