From b60d6c1abc9a41456c683a79d4ee27e7bdf7071b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 13 五月 2025 14:23:38 +0800
Subject: [PATCH] #Agv启动入库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index ddf7c51..d78953b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -110,17 +110,23 @@
if (Objects.isNull(orderItem)) {
throw new CoolException("鏀惰揣鍗曟嵁涓嶅瓨鍦紒锛�");
}
- Double sum = item.getDisQty() + item.getSafeQty();
+
+ Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
+ Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
+
+ Double sum = disQty + safeQty;
orderItem.setIsptQty(sum);
- if (!warehouseAreasItemService.updateById(orderItem)) {
- throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�");
- }
+ if (sum.compareTo(0.0) > 0) {
+ if (!warehouseAreasItemService.updateById(orderItem)) {
+ throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�");
+ }
- if (Objects.isNull(orderItem.getIsptResult())) {
- operateReceipt(item, orderItem);
- } else {
+ if (Objects.isNull(orderItem.getIsptResult())) {
+ operateReceipt(item, orderItem);
+ } else {
+ }
}
}
@@ -146,19 +152,21 @@
* @version 1.0
*/
private void operateReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) {
- Double sum = item.getDisQty() + item.getSafeQty();
+ Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
+ Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
+ Double sum = disQty + safeQty;
if (sum.compareTo(orderItem.getAnfme()) >= 0) {
//瀹屾垚璐ㄦ,鍋氭洿鏂版搷浣�
- if (item.getSafeQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getSafeQty());
+ if (safeQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(safeQty);
orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
if (!warehouseAreasItemService.updateById(orderItem)) {
throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
}
}
- if (item.getDisQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getDisQty())
+ if (disQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(disQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
@@ -167,8 +175,8 @@
}
} else {
//鏈畬鎴愬仛娣诲姞鎿嶄綔
- if (item.getSafeQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getSafeQty())
+ if (safeQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(safeQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
@@ -176,8 +184,8 @@
}
}
- if (item.getDisQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getDisQty())
+ if (disQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(disQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
--
Gitblit v1.9.1