From bb85dbc5fc9a9ddda99132ae16887fd27959a854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 06 一月 2025 16:18:48 +0800
Subject: [PATCH] 补充注释、语言，转工单时添加未勾选数据时的弹窗，修改报工新增查询复合工序不能查询出每一层的问题，修改次破报表响应超时问题
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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 d68ebdd..a72b0d5 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
@@ -126,8 +126,9 @@
map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
//鐝粍涓嬫媺妗�
map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
-
+ //娆＄牬绫诲瀷
map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ //娆＄牬鍘熷洜
map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
//鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
@@ -177,8 +178,6 @@
}
});
}
-
-
map.put("Detail",details );
}
}
@@ -197,8 +196,6 @@
//鍘嗗彶宸ュ簭
map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
}
-
-
return map;
}
@@ -210,6 +207,7 @@
map.put("process", reportingWorkMapper.SelectProcessMp());
}
else {
+ //瀵规寚瀹氬伐搴忓崟鐙煡璇�
if (process.equals("澶硅兌")){
map.put("process",reportingWorkMapper.getSelectProcessJiajiao() );
}
@@ -240,7 +238,7 @@
reportingWork.setProcessId(processIdStr[0]);
int reviewState = (int) reportingWorkJson.get("type");
- if (reviewState == 1) {
+ if (reviewState == 1) {//瀹℃牳閫氳繃
reportingWork.setReviewed(reportingWork.getCreator());
reportingWork.setReviewedState(1);
} else {
@@ -252,14 +250,6 @@
reportingWorkMapper.insert(reportingWork);
//鍓〃寰幆鎻掑叆锛屽苟涓旀彃鍏ユ鐮翠俊鎭〃銆傚啀鏍规嵁娆＄牬淇℃伅淇敼璁㈠崟鐜荤拑娴佺▼琛ㄧ殑瀹屽伐鏁伴噺涓庡埡鐮存暟閲�
reportingWorkDetails.forEach(reportingWorkDetail -> {
-// reportingWork.setThisProcessQuantity(
-// reportingWork.getThisProcessQuantity()
-// +reportingWorkDetail.getCompletedQuantity()
-// +reportingWorkDetail.getBreakageQuantity());
-// reportingWork.setThisCompletedQuantity(
-// reportingWork.getThisCompletedQuantity()+reportingWorkDetail.getCompletedQuantity());
-// reportingWork.setThisWornQuantity(
-// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());
int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkDetail.setReportingWorkId(reportingWorkId);
@@ -378,7 +368,7 @@
int index = processId.lastIndexOf("/") + 1;
String result = processId.substring(index);
String technologyStr = reportingWork.get("technologyStr");
-
+//鍚堢墖宸ュ簭
if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("鍖呰")){
LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
@@ -422,8 +412,11 @@
});
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));
@@ -440,8 +433,9 @@
map.put("deviceType", reportingWorkMapper.SelectWorkBasicDeviceMp(thisProcess));
//鐝粍涓嬫媺妗�
map.put("teamsType", reportingWorkMapper.SelectWorkBasicTeamsMp(thisProcess));
-
+ //娆＄牬绫诲瀷
map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ //娆＄牬鍘熷洜
map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
//鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
@@ -477,7 +471,7 @@
.delete(new LambdaQueryWrapper<ReportingWorkDetail>()
.eq(ReportingWorkDetail::getReportingWorkId, reportingWork.getReportingWorkId()));
- //鏇寸粏鎶ュ伐涓昏〃
+ //鏇存柊鎶ュ伐涓昏〃
int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkMapper.updateById(reportingWork);
reportingWorkDetails.forEach(reportingWorkDetail -> {
@@ -490,6 +484,7 @@
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
+ //鏄惁淇敼璐ㄦ鐘舵��
if (!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
--
Gitblit v1.8.0