From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +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/QlyIsptItemServiceImpl.java | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 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..d375c92 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
@@ -16,6 +16,7 @@
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -110,17 +111,22 @@
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);
+ }
}
}
@@ -135,7 +141,6 @@
.eq(QlyInspect::getId, isptItem.stream().findFirst().get().getIspectId()));
}
-// qlyIsptItemService.pageByIsptResult(null, new QueryWrapper<QlyIsptItem>())
return true;
}
@@ -146,41 +151,57 @@
* @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).setAnfme(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())
+ WarehouseAreasItem areasItem = new WarehouseAreasItem();
+ BeanUtils.copyProperties(orderItem, areasItem);
+ if (disQty.compareTo(0.0) > 0) {
+ areasItem.setIsptQty(disQty)
+ .setAnfme(disQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
- if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
+ if (!warehouseAreasItemService.saveOrUpdate(areasItem)) {
throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
}
}
} else {
+ orderItem.setAnfme(orderItem.getAnfme() - sum);
+ if (!warehouseAreasItemService.updateById(orderItem)) {
+ throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
+
+ WarehouseAreasItem areasItem = new WarehouseAreasItem();
+ BeanUtils.copyProperties(orderItem, areasItem);
//鏈畬鎴愬仛娣诲姞鎿嶄綔
- if (item.getSafeQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getSafeQty())
+ if (safeQty.compareTo(0.0) > 0) {
+ areasItem.setIsptQty(safeQty)
+ .setAnfme(safeQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
- if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
+ if (!warehouseAreasItemService.saveOrUpdate(areasItem)) {
throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
}
}
- if (item.getDisQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getDisQty())
+ WarehouseAreasItem items = new WarehouseAreasItem();
+ BeanUtils.copyProperties(orderItem, items);
+ if (disQty.compareTo(0.0) > 0) {
+ items.setIsptQty(disQty)
+ .setAnfme(disQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
- if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
+ if (!warehouseAreasItemService.saveOrUpdate(items)) {
throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
}
}
--
Gitblit v1.9.1