From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +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 | 90 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 24 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 87f68d9..829693b 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
@@ -30,6 +30,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
@@ -149,7 +150,8 @@
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
if(process.equals("涓┖")){
- String orderId = processIdStr.substring(0,10);
+ //鑾峰彇璇ユ祦绋嬪崱璁㈠崟鍙�
+ String orderId = reportingWorkMapper.selectOrderid(processIdStr);
details.forEach( detail -> {
Integer glassId = orderGlassDetailMapper.
getMinIdByGroup(orderId,
@@ -166,7 +168,7 @@
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
if(process.equals("涓┖")){
- String orderId = processIdStr.substring(0,10);
+ String orderId = reportingWorkMapper.selectOrderid(processIdStr);
details.forEach( detail -> {
Integer glassId = orderGlassDetailMapper.
getMinIdByGroup(orderId,
@@ -248,6 +250,8 @@
LocalDateTime localDateTime = LocalDateTime.now();
reportingWork.setReportingWorkTime(localDateTime);
}
+ //鏄惁绾胯ˉ 1鐜拌ˉ 0鏈幇琛�
+ int isPatch = (reportingWorkJson.get("isPatch") != null) ? (int) reportingWorkJson.get("isPatch") : 0;
reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
//涓昏〃鎻掑叆
@@ -268,6 +272,9 @@
//璺ㄥ伐搴忔鐮翠慨鏀硅川妫�鐘舵��
if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
+ }
+ if (isPatch == 1){
+ damageDetail.setQualityInsStatus(2);
}
damageDetailsMapper.insert(damageDetail);
});
@@ -321,17 +328,21 @@
orderProcessDetail.setReportingWorkNum(reportingWorkDetail.getCompletedQuantity());
orderProcessDetail.setReportingWorkNumCount(reportingWorkDetail.getCompletedQuantity());
- //鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
- LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
- .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
- .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
- .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
- .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
- .setSql("reporting_work_num_count = reporting_work_num_count +" + orderProcessDetail.getReportingWorkNum())
- .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
- .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
- orderProcessDetailMapper.update(null, updateWrapper);
+
+ if (isPatch == 0){//鏈幇琛�
+ //鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
+ LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
+ .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
+ .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
+ .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ .setSql("reporting_work_num_count = reporting_work_num_count +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("update_time = now()")
+ .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
+ orderProcessDetailMapper.update(null, updateWrapper);
+ }
//鍒ゆ柇瀹屽伐鏁伴噺鍜屽埡鐮存暟閲忔槸鍚︿负0锛屼负0鍒欎笉鎻掑叆鍒版暟鎹簱
if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) {
@@ -372,19 +383,24 @@
int index = processId.lastIndexOf("/") + 1;
String result = processId.substring(index);
String technologyStr = reportingWork.get("technologyStr");
+ String[] processIdStr = processId.split("/");
+ String nowDate = LocalDate.now().toString();
+ //鑾峰彇鎶ュ伐宸ュ簭鏄惁涓哄鍚堝伐绋�
+ String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);
//鍚堢墖宸ュ簭
-if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("鍖呰")){
+if (laminating.equals("laminating")){
LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper
- .eq(ReportingWork::getProcessId, processId.substring(0, 14))
+ .eq(ReportingWork::getProcessId, processIdStr[0])
.eq(ReportingWork::getThisProcess, reportingWork.get("process"))
.eq(ReportingWork::getReviewedState, 0)
.setSql("reviewed_state =1")
- .set(ReportingWork::getReviewed, userName);
+ .set(ReportingWork::getReviewed, userName)
+ .set(ReportingWork::getExamineTime, nowDate);
reportingWorkMapper.update(null, updateWrapper);
}else {
- reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName);
+ reportingWorkMapper.ReviewReportingWorkMp(processIdStr[0],reportingWork.get("process"),technologyStr,userName);
}
return true;
@@ -540,6 +556,7 @@
Map<String, Object> map = new HashMap<>();
map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
+ map.put("footSum" ,reportingWorkMapper.getFootSum(selectTime1, selectTime2, orderId,reportingWork));
return map;
}
@@ -673,13 +690,38 @@
JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
ReportingWorkDetail reportingWorkDetail =JSON.parseObject(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
+
+ //鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());
+
+ int index = technologicalProcess.indexOf("-");
+ String interceptProcess = "";
+ if (index <0){
+ interceptProcess = technologicalProcess;
+ }
+ else {
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ interceptProcess = technologicalProcess.substring(0, index);
+ }
+ int processNum =0;
+ if (interceptProcess.equals(reportingWork.getThisProcess())) {
+ processNum = reportingWorkMapper.selectFlowCardNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ }else{
+ processNum = reportingWorkMapper.selectGlassProcessNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ }
+
//鑾峰彇鍙姤鏁伴噺
- int processNum = reportingWorkMapper.selectGlassProcessNum(
- reportingWorkDetail.getOrderNumber(),
- reportingWorkDetail.getTechnologyNumber(),
- reportingWork.getProcessId(),
- reportingWork.getThisProcess()
- );
+
//鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
return false;
@@ -757,7 +799,7 @@
//鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
- .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
.eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
.eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
.eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
--
Gitblit v1.8.0