From 82cd6c55c94e058545cf2994201b54661ec3fb49 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 九月 2024 23:42:53 +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, 10 insertions(+), 0 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 7df794a..4c9af18 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
@@ -651,6 +651,8 @@
.eq(ReportingWork::getProcessId,reportingWork.getProcessId())
.eq(ReportingWork::getThisProcess,reportingWork.getThisProcess())
.eq(ReportingWork::getDeviceName,reportingWork.getDeviceName())
+ .eq(ReportingWork::getReviewedState,0)//瀹℃牳鐘舵�佺瓑浜�0锛屾湭鍒犻櫎
+ .eq(ReportingWork::getThisWornQuantity,0)
.eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
.eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
.orderByDesc(ReportingWork::getId)
@@ -672,6 +674,14 @@
reportingWorkMapper.insert(reportingWork);
reportingWorkDetailMapper.insert(reportingWorkDetail);
}else{
+ LambdaUpdateWrapper<ReportingWork> reportingWorkLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ reportingWorkLambdaUpdateWrapper
+ .eq(ReportingWork::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
+ .setSql("this_completed_quantity = this_completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
+ reportingWorkMapper.update(null, reportingWorkLambdaUpdateWrapper);
+
+
+
LambdaUpdateWrapper<ReportingWorkDetail> detailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
detailLambdaUpdateWrapper.eq(ReportingWorkDetail::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
.eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
--
Gitblit v1.8.0