From 76c38d4e7a6e46f34f547fad873dc383c1397d00 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 24 五月 2025 14:53:09 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index b0584d9..72a17c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -138,6 +138,10 @@
throw new CoolException("搴撳瓨淇℃伅涓嶅瓨鍦紒");
}
+ if (locItem.getOutQty().compareTo(0.0) < 0) {
+ throw new CoolException("鍑哄簱鏁伴噷涓嶈兘灏忎簬0锛侊紒");
+ }
+
if (locItem.getAnfme().compareTo(qty) < 0) {
Double minusQty = Math.round((locItem.getAnfme() - locItem.getWorkQty()) * 10000) / 10000.0;
item.setWorkQty(minusQty);
@@ -165,10 +169,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R genMoveTask(Map<String, Object> map) {
- if (Objects.isNull(map.get("targetLoc")) && StringUtils.isNotBlank(map.get("targetLoc").toString())) {
- throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�1");
+ if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) {
+ throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�");
}
- if (Objects.isNull(map.get("orgLoc")) && StringUtils.isNotBlank(map.get("orgLoc").toString())) {
+ if (Objects.isNull(map.get("orgLoc")) || StringUtils.isBlank(map.get("orgLoc").toString())) {
throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
}
@@ -177,12 +181,19 @@
throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
}
- Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("targetLoc").toString()));
+ orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+
+ if (!locService.updateById(orgLoc)) {
+ throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
+
+ Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("tarLoc").toString()));
if (Objects.isNull(targetLoc)) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
}
- targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
if (!locService.updateById(targetLoc)) {
throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
@@ -197,6 +208,10 @@
.setTaskStatus(TaskStsType.GENERATE_IN.id)
.setBarcode(orgLoc.getBarcode());
+ if (!taskService.save(task)) {
+ throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
+ }
+
List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
if (locItems.isEmpty()) {
throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
--
Gitblit v1.9.1