From 3fca1b6a028a1688120e9fee8fe538a588a615ab Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 11 一月 2025 17:26:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 45 ++-------------------------------------------
1 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index eb14888..b553989 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -8,10 +8,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-/**
- * 璐ф灦鏍稿績鍔熻兘
- * Created by vincent on 2020/6/11
- */
@Slf4j
@Service
public class CommonService {
@@ -20,9 +16,6 @@
private WrkMastService wrkMastService;
@Autowired
private WrkLastnoService wrkLastnoService;
- @Autowired
- private WrkChargeService wrkChargeService;
-
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -39,7 +32,7 @@
int eNo = wrkLastno.getENo();
workNo = workNo>=eNo ? sNo : workNo+1;
while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo);
if (null != wrkMast) {
workNo = workNo>=eNo ? sNo : workNo+1;
} else {
@@ -55,42 +48,8 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectByWorkNo(workNo)!=null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
- }
- }
- return workNo;
- }
-
- public int getChargeWorkNo(Integer wrkMk) {
- WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
- if (Cools.isEmpty(wrkLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- int workNo = wrkLastno.getWrkNo();
- int sNo = wrkLastno.getSNo();
- int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
- while (true) {
- WrkCharge wrkCharge = wrkChargeService.selectById(workNo);
- if (null != wrkCharge) {
- workNo = workNo>=eNo ? sNo : workNo+1;
- } else {
- break;
- }
- }
- // 淇敼搴忓彿璁板綍
- if (workNo > 0){
- wrkLastno.setWrkNo(workNo);
- wrkLastnoService.updateById(wrkLastno);
- }
- // 妫�楠�
- if (workNo == 0) {
- throw new CoolException("鐢熸垚鍏呯數宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
- } else {
- if (wrkChargeService.selectById(workNo)!=null) {
- throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ厖鐢靛伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
--
Gitblit v1.9.1