From 8bc9d7124b24669574b5885776b1bba9a2c6c9cc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 18 九月 2024 15:31:29 +0800
Subject: [PATCH] 补片删除Bug修复,流程卡打印添加打印人,调整补片返工流程卡样式

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index bf9f55c..04f0a32 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -252,12 +252,17 @@
                     //鍒ゆ柇鏄惁宸茬粡瀹℃牳
                     if(patchLog1.getReviewStatus()==0){
                         //鍒犻櫎琛ョ墖琛ㄥ搴旇ˉ鐗噄d鏁版嵁
-                        patchMapper.deleteReplenishMp(patchLog.getPatchId());
-                        //淇敼娆$牬鏄庣粏琛ㄨˉ鐗囨暟閲忓拰鐘舵��
-                        patchMapper.updatePatchDdMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber(),patchLog.getPatchNum());
+                        patchMapper.deleteReplenishMp(patchLog1.getId());
+                        //鍒犻櫎娆$牬鏄庣粏琛�
+                        patchMapper.updatePatchDdMp(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchReason());
                         //淇敼鎶ュ伐鏄庣粏琛ㄧ姸鎬�
-                        patchMapper.updatePatchBgMp(patchLog.getReportingWorkId(),patchLog.getOrderSort(),patchLog.getTechnologyNumber());
-
+                        patchMapper.updatePatchBgMp(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber());
+                        //淇敼鎶ュ伐涓昏〃娆$牬鏁伴噺
+                        reportingWorkMapper.updateRWPatchNum(patchLog1.getReportingWorkId(),patchLog1.getPatchNum());
+                        //淇敼鎶ュ伐鍓〃娆$牬鏁伴噺
+                        reportingWorkMapper.updateRWDPatchNum(patchLog1.getReportingWorkId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum());
+                        //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+                        reportingWorkMapper.updateReplenishWorkProcess(patchLog1.getProcessId(),patchLog1.getOrderSort(),patchLog1.getTechnologyNumber(),patchLog1.getPatchNum(),patchLog1.getPatchProcesses());
                     }
                     else{
                         saveState = false;
@@ -270,7 +275,7 @@
             //灏嗗紓甯镐紶鍏ユ暟鎹簱
             SysError sysError = new SysError();
             sysError.setError(e.toString());
-            sysError.setFunc("saveOrder");
+            sysError.setFunc("deleteReplenishSv");
             sysErrorService.insert(sysError);
             saveState = false;
 

--
Gitblit v1.8.0