From 6e7575427ba0aec46d377719bc58ec0355bb335a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 09 十月 2022 14:24:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f568cb7..9fb0b29 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -47,6 +47,9 @@
private SlaveProperties slaveProperties;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private WrkChargeService wrkChargeService;
+
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -86,6 +89,40 @@
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