From be8a84dd3610443ebc82a9c75f888920b882bf01 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 13 九月 2024 11:38:59 +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 | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 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 3bbc4ab..f7f1e84 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
@@ -199,7 +199,8 @@
String formattedDate = dateFormat.format(currentDate);
String reportingWorkId = "BG" + formattedDate + formattedNumber;
reportingWork.setReportingWorkId(reportingWorkId);
- reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14));
+ String[] processIdStr = reportingWork.getProcessId().split("/");
+ reportingWork.setProcessId(processIdStr[0]);
int reviewState = (int) reportingWorkJson.get("type");
if (reviewState == 1) {
@@ -208,6 +209,8 @@
} else {
reportingWork.setReviewedState(0);
}
+
+ reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
//涓昏〃鎻掑叆
reportingWorkMapper.insert(reportingWork);
//鍓〃寰幆鎻掑叆锛屽苟涓旀彃鍏ユ鐮翠俊鎭〃銆傚啀鏍规嵁娆＄牬淇℃伅淇敼璁㈠崟鐜荤拑娴佺▼琛ㄧ殑瀹屽伐鏁伴噺涓庡埡鐮存暟閲�
@@ -335,6 +338,7 @@
String processId = reportingWork.get("processId");
String thisProcess = reportingWork.get("thisProcess");
+ String userName=reportingWork.get("userName");
int index = processId.lastIndexOf("/") + 1;
String result = processId.substring(index);
String technologyStr = reportingWork.get("technologyStr");
@@ -346,10 +350,11 @@
.eq(ReportingWork::getProcessId, processId.substring(0, 14))
.eq(ReportingWork::getThisProcess, reportingWork.get("process"))
.eq(ReportingWork::getReviewedState, 0)
- .setSql("reviewed_state =1");
+ .setSql("reviewed_state =1")
+ .set(ReportingWork::getReviewed, userName);
reportingWorkMapper.update(null, updateWrapper);
}else {
- reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr);
+ reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName);
}
return true;
@@ -654,11 +659,12 @@
.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)
);
+
+
//鍒ゆ柇鎶ュ伐琛ㄦ槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯鏂板鎶ュ伐涓诲壇琛ㄦ暟鎹紝瀛樺湪鍒欎慨鏀瑰壇琛ㄦ暟鎹�
if(ReportingWorks.isEmpty()){
//鑾峰彇褰撳墠鏈�澶ф姤宸ュ崟鍙风敓鎴愭姤宸ュ崟鍙�
@@ -675,20 +681,34 @@
reportingWorkMapper.insert(reportingWork);
reportingWorkDetailMapper.insert(reportingWorkDetail);
}else{
+
+ ReportingWorkDetail reportingWorkDetail1 = reportingWorkDetailMapper.selectOne(
+ new LambdaQueryWrapper<ReportingWorkDetail>()
+ .eq(ReportingWorkDetail::getReportingWorkId,ReportingWorks.get(0).getReportingWorkId())
+ .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
+ .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
+ );
+
+ if(reportingWorkDetail1 == null){
+ reportingWorkDetail.setReportingWorkId(ReportingWorks.get(0).getReportingWorkId());
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ }else{
+ LambdaUpdateWrapper<ReportingWorkDetail> detailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ detailLambdaUpdateWrapper.eq(ReportingWorkDetail::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
+ .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
+ .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
+ .setSql("completed_quantity = completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
+ reportingWorkDetailMapper.update(null, detailLambdaUpdateWrapper);
+ }
+
+
+
+
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())
- .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
- .setSql("completed_quantity = completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
- reportingWorkDetailMapper.update(null, detailLambdaUpdateWrapper);
}
--
Gitblit v1.8.0