From df352f239c4c41fb7eeb6ff1f8036a2911b66151 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 八月 2024 14:42:24 +0800
Subject: [PATCH] 更新
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 163 +++++++++++++++++++++++++++--------------------------
1 files changed, 83 insertions(+), 80 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 03622b1..6cfd6a3 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
@@ -78,93 +78,95 @@
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);
+ if (technologicalProcess!=null || !technologicalProcess.equals("")){
+ String[] processList = technologicalProcess.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ int length = processList.length;
+ //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
+ String previousProcess = "";
+ String nextProcess = "";
- String[] processList = technologicalProcess.split("->");
- //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
- String interceptProcess = processList[0];
- int length = processList.length;
-
- //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
- String previousProcess = "";
- String nextProcess = "";
-
- //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
- for (int i = 0; i < length; i++) {
- //褰撳埌褰撳墠宸ュ簭鏃�
- if (processList[i].equals(process)) {
- //鑾峰彇褰撳墠宸ュ簭鐨勪笂涓�閬撳伐搴�
- if (i - 1 < 0) {
- previousProcess = "";
- } else {
- previousProcess = processList[i - 1];
- }
- //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
- if (i + 1 > length - 1) {
- nextProcess = "";
- } else {
- nextProcess = processList[i + 1];
- }
- //鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�
- map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process,reportType));
- map.put("thisProcess", processList);
- break;
- }
- }
-
- //宸ヨ壓娴佺▼
- map.put("technologicalProcess", technologicalProcess);
-
- //璁惧涓嬫媺妗�
- map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
- //鐝粍涓嬫媺妗�
- map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
-
- map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
- map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
-
- //鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
- String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
-
- map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));
-
- //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
- if (interceptProcess.equals(process)) {
- //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
- map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
- } else {
- //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process);
- if(process.equals("涓┖")){
- String orderId = processIdStr.substring(0,10);
- details.forEach( detail -> {
- Integer glassId = orderGlassDetailMapper.
- getMinIdByGroup(orderId,
- String.valueOf(detail.get("order_number")),
- String.valueOf(detail.get("group")));
- int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
- if(listGlassId !=glassId){
- detail.put("rowClass","latter");
+ //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
+ for (int i = 0; i < length; i++) {
+ //褰撳埌褰撳墠宸ュ簭鏃�
+ if (processList[i].equals(process)) {
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笂涓�閬撳伐搴�
+ if (i - 1 < 0) {
+ previousProcess = "";
+ } else {
+ previousProcess = processList[i - 1];
}
- });
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
+ if (i + 1 > length - 1) {
+ nextProcess = "";
+ } else {
+ nextProcess = processList[i + 1];
+ }
+ //鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�
+ map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process,reportType));
+ map.put("thisProcess", processList);
+ break;
+ }
}
+ //宸ヨ壓娴佺▼
+ map.put("technologicalProcess", technologicalProcess);
- map.put("Detail",details );
+ //璁惧涓嬫媺妗�
+ map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
+ //鐝粍涓嬫媺妗�
+ map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
+
+ map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
+
+ //鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
+ String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
+
+ map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));
+
+ //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
+ if (interceptProcess.equals(process)) {
+ //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
+ map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
+ } else {
+ //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+ List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
+ if(process.equals("涓┖")){
+ String orderId = processIdStr.substring(0,10);
+ details.forEach( detail -> {
+ Integer glassId = orderGlassDetailMapper.
+ getMinIdByGroup(orderId,
+ String.valueOf(detail.get("order_number")),
+ String.valueOf(detail.get("group")));
+ int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
+ if(listGlassId !=glassId){
+ detail.put("rowClass","latter");
+ }
+ });
+ }
+
+
+ map.put("Detail",details );
+ }
+
+ // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
+
+ // 鍚庣画宸ュ簭锛堜笂宸ュ簭鎶ュ伐鏁�-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟锛�
+
+ //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
+ String historyProcess = reportingWorkMapper.historyProcessMp(processIdStr);
+ //鍘嗗彶鎶ュ伐宸ュ簭璁惧
+ map.put("historyDevice", reportingWorkMapper.historyDeviceMp(historyProcess, process));
+ //鍘嗗彶鎶ュ伐宸ュ簭鐝粍
+ map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
+ //鍘嗗彶宸ュ簭
+ map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
}
- // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
- // 鍚庣画宸ュ簭锛堜笂宸ュ簭鎶ュ伐鏁�-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟锛�
-
- //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
- String historyProcess = reportingWorkMapper.historyProcessMp(processIdStr);
- //鍘嗗彶鎶ュ伐宸ュ簭璁惧
- map.put("historyDevice", reportingWorkMapper.historyDeviceMp(historyProcess, process));
- //鍘嗗彶鎶ュ伐宸ュ簭鐝粍
- map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
- //鍘嗗彶宸ュ簭
- map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
return map;
}
@@ -212,7 +214,7 @@
// reportingWork.setThisWornQuantity(
// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());
-
+ int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkDetail.setReportingWorkId(reportingWorkId);
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
//娆＄牬鏄庣粏琛ㄦ彃鍏ユ暟鎹�
@@ -222,7 +224,8 @@
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
- if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess())) {
+ //璺ㄥ伐搴忔鐮翠慨鏀硅川妫�鐘舵��
+ if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
damageDetailsMapper.insert(damageDetail);
--
Gitblit v1.8.0