From dbec8a881baf27254a13f1f9c7b0167b9f064ab5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 15 三月 2024 15:36:09 +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 | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 95934b1..dd619ed 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
@@ -195,6 +195,9 @@
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
+ if(damageDetail.getResponsibleProcess()!=reportingWork.getThisProcess()){
+ damageDetail.setQualityInsStatus(1);
+ }
damageDetailsMapper.insert(damageDetail);
});
}
@@ -251,7 +254,12 @@
.setSql("reporting_work_num =reporting_work_num +"+orderProcessDetail.getReportingWorkNum())
.setSql("broken_num =broken_num +"+orderProcessDetail.getBrokenNum());
orderProcessDetailMapper.update(null,updateWrapper);
- reportingWorkDetailMapper.insert(reportingWorkDetail);
+
+ //鍒ゆ柇瀹屽伐鏁伴噺鍜屽埡鐮存暟閲忔槸鍚︿负0锛屼负0鍒欎笉鎻掑叆鍒版暟鎹簱
+ if(!(reportingWorkDetail.getCompletedQuantity()==0 && reportingWorkDetail.getBreakageQuantity()==0)){
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ }
+
//鏇存柊娴佺▼鍗¤〃鐨勬姤宸ユ暟閲�
if(Objects.equals(reportingWork.getNextProcess(), "")){
LambdaUpdateWrapper<FlowCard> flowCardLambdaUpdateWrapper =
@@ -370,7 +378,12 @@
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
//姣忎竴鏉℃姤宸ユ暟鎹惊鐜彃鍏ユ鐮存槑缁嗚〃
if(damageDetails!=null && !damageDetails.isEmpty()){
- damageDetails.forEach(damageDetailsMapper::insert);
+ damageDetails.forEach(damageDetail->{
+ if(!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess())){
+ damageDetail.setQualityInsStatus(1);
+ }
+ damageDetailsMapper.insert(damageDetail);
+ });
}
//鎻掑叆鎶ュ伐鏁版嵁
reportingWorkDetailMapper.insert(reportingWorkDetail);
--
Gitblit v1.8.0