From 77488ce5ba10ca8a29d6a29a7c2a69ba62cdf2d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 14:50:00 +0800
Subject: [PATCH] 质检添加搜索条件
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 4a42f57..81875e9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -31,20 +31,22 @@
@Service("waitPakinService")
public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
- @Autowired
- private AsnOrderItemService asnOrderItemService;
+
@Autowired
private AsnOrderService asnOrderService;
-
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
@Autowired
private WaitPakinService waitPakinService;
@Autowired
private WaitPakinItemService waitPakinItemService;
/**
- * 鍗曟嵁缁勬嫋
- * @param waitPakin
+ * @author Ryan
+ * @description 缁勬嫋
+ * @param
* @return
+ * @time 2025/3/29 14:42
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -56,7 +58,7 @@
throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
}
- double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getQty).sum();
+ double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
WaitPakin pakin = new WaitPakin();
@@ -100,9 +102,9 @@
.setMatnrCode(item.getMatnrCode());
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
- Double v = item.getWorkQty() + waitPakinItem.getQty();
+ Double v = item.getWorkQty() + waitPakinItem.getReceiptQty();
pakinItem.setWorkQty(v)
- .setAnfme(waitPakinItem.getQty())
+ .setAnfme(waitPakinItem.getReceiptQty())
.setTrackCode(waitPakinItem.getTrackCode());
/**鏇存柊鍗曟嵁鎵ц涓簱瀛�*/
if (v.compareTo(item.getAnfme()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
@@ -120,6 +122,13 @@
return pakin;
}
+ /**
+ * @author Ryan
+ * @description 缁勬嫋瑙ｇ粦
+ * @param
+ * @return
+ * @time 2025/3/29 14:42
+ */
@Override
public WaitPakin unBind(WaitPakinParam param) {
String barcode = param.getBarcode();
@@ -135,11 +144,12 @@
List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakins.getId())
- .eq(WaitPakinItem::getMatnrId, list));
+ .in(WaitPakinItem::getMatnrId, list));
if (pakinItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪锛侊紒");
}
- if (!waitPakinItemService.removeByIds(pakinItems)) {
+ List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
+ if (!waitPakinItemService.removeByIds(ids)) {
throw new CoolException("缁勬嫋鏄庣粏瑙ｇ粦澶辫触锛侊紒");
}
return waitPakins;
--
Gitblit v1.9.1