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 | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 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 84f0eda..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,9 +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;
@@ -26,6 +30,8 @@
@Autowired
private QlyInspectService qlyInspectService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
/**
* @author Ryan
@@ -42,9 +48,10 @@
}
List<QlyIsptItem> isptItem = params.getIsptItem();
List<Long> list = isptItem.stream().map(QlyIsptItem::getId).collect(Collectors.toList());
- if (params.getType().equals("2") || params.getType().equals("1")) {
+ if (Short.parseShort(params.getType()) == QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val || Short.parseShort(params.getType()) == QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val) {
+ //1锛氬悎鏍硷紝 2锛氫笉鍚堟牸, 0: 鍏跺畠锛堥粯璁わ級
isptItem.forEach(item -> {
- if (params.getType().equals("1")) {
+ if (Short.parseShort(params.getType()) == QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val) {
//TODO 鍏堟崱鍚庢敹涓洪�佽揣鏁伴噺锛屽厛鏀跺悗鎹′负鏀惰揣鏁伴噺
item.setSafeQty(item.getDlyQty());
item.setDisQty(0.0);
@@ -54,7 +61,7 @@
}
if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>()
.set(QlyIsptItem::getSafeQty, item.getSafeQty())
- .set(QlyIsptItem::getIsptResult, params.getType())
+ .set(QlyIsptItem::getIsptResult, Short.parseShort(params.getType()))
.set(QlyIsptItem::getDisQty, item.getDisQty())
.in(QlyIsptItem::getId, item.getId()))) {
throw new CoolException("淇敼澶辫触锛侊紒");
@@ -65,7 +72,6 @@
throw new CoolException("鏄庣粏淇敼澶辫触");
}
}
-
List<QlyIsptItem> isptItems = this.list(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getId, list));
if (isptItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氭槑缁嗕笉瀛樺湪锛侊紒");
@@ -74,19 +80,39 @@
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 dlyQty = items.stream().mapToDouble(QlyIsptItem::getDlyQty).sum();
Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum();
Double qlyQty = safeQty + disQty;
//瀹夊叏鏁伴噺锛岃川妫�鏁伴噺
inspect.setSafeQty(safeQty)
.setIsptQty(qlyQty);
if (Double.compare(disQty, 0) > 0) {
- inspect.setIsptResult(Short.parseShort("4"));
+ inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val);
}
- if (Double.compare(safeQty, dlyQty) == 0) {
- inspect.setIsptStatus("1");
- inspect.setIsptResult(Short.parseShort("1"));
+ if (Double.compare(safeQty, inspect.getDlyQty()) == 0) {
+// inspect.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val);
+ inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
}
if (!qlyInspectService.updateById(inspect)) {
throw new CoolException("璐ㄦ鏁伴噺淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1