From a15dba424e67b4773a546246c396b83d3b820d98 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 04 七月 2024 10:27:12 +0800
Subject: [PATCH] 提交重复订单提示
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..e75286d 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;
//瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
@@ -112,6 +112,8 @@
//鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
+
+ map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));
//鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
if (interceptProcess.equals(process)) {
@@ -191,7 +193,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);
@@ -303,6 +305,8 @@
.eq(Order::getOrderId, reportingWork.getOrderId())));
reportingWork.setFlowCard(new FlowCard());
+
+
List<Map<String, Object>> reportingWorkDetails = reportingWorkMapper.selectByReportingWorkId(reportingWorkId, reportingWork.getNextProcess());
reportingWorkDetails.forEach(reportingWorkDetail -> {
List<DamageDetails> damageDetailsList = new ArrayList<>();
@@ -312,14 +316,16 @@
.eq(DamageDetails::getTechnologyNumber, reportingWorkDetail.get("technology_number"))
);
reportingWorkDetail.put("damageDetails", damageDetailsList);
- });
+ });
Map<String, Object> map = new HashMap<>();
map.put("reportingWork", reportingWork);
map.put("reportingWorkDetails", reportingWorkDetails);
map.put("basic", getReportingWorkBase(reportingWork.getProcessId(), reportingWork.getThisProcess()));
-
+ //鏍规嵁鎶ュ伐缂栧彿鑾峰彇灞�
+ map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));
+ map.put("numberList", flowCardMapper.getGlassNumber(reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId),reportingWork.getProcessId()));
return map;
--
Gitblit v1.8.0