From 45430b88dab1451ecff39236dab01d5668b5b9c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:22 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 61 ++++++++++++++++++++----------
1 files changed, 40 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 d375c92..8970a59 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.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +41,8 @@
private QlyIsptItemService qlyIsptItemService;
@Autowired
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
+ @Autowired
+ private CompanysServiceImpl companysService;
/**
* @param
@@ -107,27 +110,28 @@
throw new CoolException("鍗曟嵁鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
}
- WarehouseAreasItem orderItem = warehouseAreasItemService.getById(item.getRcptId());
- if (Objects.isNull(orderItem)) {
- throw new CoolException("鏀惰揣鍗曟嵁涓嶅瓨鍦紒锛�");
- }
+// WarehouseAreasItem orderItem = warehouseAreasItemService.getById(item.getRcptId());
+// if (Objects.isNull(orderItem)) {
+// throw new CoolException("鏀惰揣鍗曟嵁涓嶅瓨鍦紒锛�");
+// }
- 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 (sum.compareTo(0.0) > 0) {
- if (!warehouseAreasItemService.updateById(orderItem)) {
- throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�");
- }
-
- //鏂板缓璐ㄦ鍗曪紝璐ㄦ缁撴灉涓嶄細鏈夎川妫�缁撴灉
- if (Objects.isNull(orderItem.getIsptResult())) {
- operateReceipt(item, orderItem);
- }
- }
+// 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 (sum.compareTo(0.0) > 0) {
+// if (!warehouseAreasItemService.updateById(orderItem)) {
+// throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�");
+// }
+// //鏂板缓璐ㄦ鍗曪紝涓嶄細鏈夎川妫�缁撴灉
+// confirmReceipt(item, orderItem);
+//
+//// if (Objects.isNull(orderItem.getIsptResult())) {
+//// operateReceipt(item, orderItem);
+//// }
+// }
}
Set<Long> isptIds = isptItem.stream().map(QlyIsptItem::getIspectId).collect(Collectors.toSet());
@@ -150,10 +154,20 @@
* @description: 璐ㄦ鍚庝慨鏀规敹璐у尯瀛樹俊鎭�
* @version 1.0
*/
- private void operateReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) {
+ @Transactional(rollbackFor = Exception.class)
+ public void confirmReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) {
Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
Double sum = disQty + safeQty;
+
+ AsnOrderItem asnOrderItem = asnOrderItemService.getById(item.getAsnItemId());
+ if (Objects.isNull(asnOrderItem)) {
+ if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, asnOrderItem.getSplrCode()));
+ orderItem.setSplrId(companys.getId());
+ }
+ }
+
if (sum.compareTo(orderItem.getAnfme()) >= 0) {
//瀹屾垚璐ㄦ,鍋氭洿鏂版搷浣�
if (safeQty.compareTo(0.0) > 0) {
@@ -208,6 +222,11 @@
}
}
+ @Override
+ public List<QlyIsptItem> selectIsptResult(LambdaQueryWrapper<QlyIsptItem> eq) {
+ return this.baseMapper.selectIsptResult(eq);
+ }
+
/**
* @author Ryan
* @date 2025/5/12
--
Gitblit v1.9.1