From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index f544c82..e81a0ae 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -68,11 +68,11 @@
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);
- //瀹氫箟-鐨勪綅缃�
- int index = technologicalProcess.indexOf("-");
- //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
- String interceptProcess = technologicalProcess.substring(0, index);
+
+
String[] processList = technologicalProcess.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
int length = processList.length;
//瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
@@ -191,7 +191,7 @@
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
- if (damageDetail.getResponsibleProcess() != reportingWork.getThisProcess()) {
+ if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess())) {
damageDetail.setQualityInsStatus(1);
}
damageDetailsMapper.insert(damageDetail);
@@ -319,6 +319,8 @@
map.put("reportingWork", reportingWork);
map.put("reportingWorkDetails", reportingWorkDetails);
map.put("basic", getReportingWorkBase(reportingWork.getProcessId(), reportingWork.getThisProcess()));
+ //鏍规嵁鎶ュ伐缂栧彿鑾峰彇灞�
+ map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));
return map;
--
Gitblit v1.8.0