From c7feb49880a74b18149efec5fb515fdab3b8ccd5 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 七月 2024 10:52:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c29fa0b..80023d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4903,10 +4903,12 @@
                     List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
                     for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
                         log.error("Jar浠诲姟瀹屾垚===>琛�={}",4564);
-                        BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
-                        jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete());
-                        if (!basJarMastService.updateById(jarMastByWrkNo)){
-                            log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触");
+                        if (wrkMastExecute.getIoType()<7 || wrkMastExecute.getIoType()==9){
+                            BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
+                            jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete(wrkMastExecute.getIoType()));
+                            if (!basJarMastService.updateById(jarMastByWrkNo)){
+                                log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触");
+                            }
                         }
                         wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsComplete());
                         wrkMastExecute.setWrkType(2);

--
Gitblit v1.9.1