From 720e0926fa1c94b952c26e111206c5d6e1ed5ba2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 四月 2026 15:59:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master
---
src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
index 2a5a4a8..ad0fab2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
@@ -1,12 +1,57 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkLastno;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkLastnoMapper;
import com.zy.asrs.service.WrkLastnoService;
+import com.zy.asrs.service.WrkMastService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service("wrkLastnoService")
public class WrkLastnoServiceImpl extends ServiceImpl<WrkLastnoMapper, WrkLastno> implements WrkLastnoService {
+ private final WrkMastService wrkMastService;
+
+ public WrkLastnoServiceImpl(WrkMastService wrkMastService) {
+ this.wrkMastService = wrkMastService;
+ }
+
+ @Override
+ public WrkLastno selectByWrkMkForUpdate(Integer wrkMk) {
+ return this.baseMapper.selectByWrkMkForUpdate(wrkMk);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int allocateNextWorkNo(Integer wrkMk) {
+ WrkLastno wrkLastno = this.baseMapper.selectByWrkMkForUpdate(wrkMk);
+ if (wrkLastno == null) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ Integer currentWrkNo = wrkLastno.getWrkNo();
+ Integer sNo = wrkLastno.getsNo();
+ Integer eNo = wrkLastno.geteNo();
+ if (currentWrkNo == null || sNo == null || eNo == null || sNo > eNo) {
+ throw new CoolException("宸ヤ綔鍙烽厤缃紓甯革紝璇疯仈绯荤鐞嗗憳");
+ }
+
+ int rangeSize = eNo - sNo + 1;
+ int candidate = currentWrkNo;
+ for (int i = 0; i < rangeSize; i++) {
+ candidate = candidate >= eNo ? sNo : candidate + 1;
+ WrkMast exists = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wrk_no", candidate), false);
+ if (exists == null) {
+ wrkLastno.setWrkNo(candidate);
+ this.updateById(wrkLastno);
+ return candidate;
+ }
+ }
+
+ throw new CoolException("褰撳墠宸ヤ綔鍙峰彿娈靛凡婊★紝鏃犳硶鍒嗛厤鍙敤宸ヤ綔鍙�");
+ }
}
--
Gitblit v1.9.1