From 0a2ce614306f517929ee939c04b09df0ca4ea2c0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 三月 2026 13:09:30 +0800
Subject: [PATCH] 1

---
 zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
index 0924ced..bd9288b 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
@@ -5,11 +5,16 @@
 import com.zy.acs.framework.exception.CoolException;
 import com.zy.asrs.entity.WrkLastno;
 import com.zy.asrs.mapper.WrkLastnoMapper;
+import com.zy.asrs.service.JobService;
 import com.zy.asrs.service.WrkLastnoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service("wrkLastnoService")
 public class WrkLastnoServiceImpl extends ServiceImpl<WrkLastnoMapper, WrkLastno> implements WrkLastnoService {
+
+@Autowired
+private JobService jobService;
 
 
     /**
@@ -30,18 +35,13 @@
         int sNo = wrkLastno.getSNo();
         int eNo = wrkLastno.getENo();
 
-        workNo = workNo >= eNo ? sNo : workNo + 1;
+        do {
+            workNo = workNo >= eNo ? sNo : workNo + 1;
+        } while (jobService.getJobByJobNo(workNo) == null);
 
         if (workNo > 0) {
             wrkLastno.setWrkNo(workNo);
             baseMapper.updateById(wrkLastno);
-        }
-        if (workNo == 0) {
-            throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
-        } else {
-            if (baseMapper.selectById(workNo) != null) {
-                throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
-            }
         }
         return workNo;
     }

--
Gitblit v1.9.1