From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +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 | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 4fbb4bf..04257e1 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
@@ -6,11 +6,13 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
+import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,6 +30,8 @@
@Autowired
private QlyInspectService qlyInspectService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
/**
* @author Ryan
@@ -76,6 +80,27 @@
for (Long key : listMap.keySet()) {
QlyInspect inspect = qlyInspectService.getById(key);
List<QlyIsptItem> items = listMap.get(key);
+ items.forEach(qlyIsptItem -> {
+ AsnOrderItem orderItem = asnOrderItemService.getById(qlyIsptItem.getAsnItemId());
+ if (qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) >= 0.00) {
+ orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val)
+ .setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val);
+ } else if (qlyIsptItem.getSafeQty().compareTo(0.00) > 0.00 && qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) < 0.00) {
+ orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val);
+ if (Double.compare(qlyIsptItem.getSafeQty() + qlyIsptItem.getDisQty(), orderItem.getAnfme()) >= 0.00 ) {
+ orderItem.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val);
+ } else {
+ orderItem.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_ING.val);
+ }
+ } else {
+ orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val)
+ .setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val);
+ }
+
+ if (!asnOrderItemService.updateById(orderItem)) {
+ throw new CoolException("鏀惰揣鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
+ });
Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum();
Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum();
Double qlyQty = safeQty + disQty;
--
Gitblit v1.9.1