From b85a2ab202e1da68ca1e532a783dc0f5685dad3b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 八月 2024 23:43:40 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 8dbcfd3..e4026c8 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
@@ -214,7 +214,7 @@
// reportingWork.setThisWornQuantity(
// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());
-
+ int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkDetail.setReportingWorkId(reportingWorkId);
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
//娆＄牬鏄庣粏琛ㄦ彃鍏ユ暟鎹�
@@ -224,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);
@@ -328,8 +329,9 @@
String thisProcess = reportingWork.get("thisProcess");
int index = processId.lastIndexOf("/") + 1;
String result = processId.substring(index);
+ String technologyStr = reportingWork.get("technologyStr");
-if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("浠撳偍")){
+if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("鍖呰")){
LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper
@@ -339,7 +341,7 @@
.setSql("reviewed_state =1");
reportingWorkMapper.update(null, updateWrapper);
}else {
- reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),result);
+ reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr);
}
return true;
--
Gitblit v1.8.0