From bf90cf8568301edb38920e8b0a0ce7e137a668ef Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 21 八月 2025 09:51:55 +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 | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 6500b96..6734c72 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
@@ -636,18 +636,7 @@
log.setFunction("deleteWork鎶ュ伐鍒犻櫎");
log.setOperatorId(userId);
log.setOperator(userName);
- if(reportingWork.getReviewedState()==0){
- //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
- List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
- for (Map<String, Object> item : workDateList) {
- //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
- reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
- }
- //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
- reportingWorkMapper.deleteWork(reportingWorkId);
- logService.saveLog(log);
- return true;
- }
+
//鍒ゆ柇鏄惁鏄叆搴撳伐搴�
if (lastProcess.equals(thisProcess)) {//鏄叆搴撳伐搴�
@@ -683,6 +672,19 @@
}
} else {//涓嶆槸鍏ュ簱宸ュ簭
+ if(reportingWork.getReviewedState()==0){
+ //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
+ List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
+ for (Map<String, Object> item : workDateList) {
+ //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+ reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
+ }
+ //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
+ reportingWorkMapper.deleteWork(reportingWorkId);
+ logService.saveLog(log);
+ return true;
+ }
+
if (count == 0) {
//鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
--
Gitblit v1.8.0