From a790b7d249485b907a0b31082f404cec1f415625 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 14:21:18 +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/WaitPakinServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 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 adedc2c..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,17 +31,22 @@
@Service("waitPakinService")
public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
+
+ @Autowired
+ private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
- private AsnOrderService asnOrderService;
+ 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)
@@ -53,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();
@@ -61,8 +66,9 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
}
-
pakin.setCode(ruleCode)
+ //鐘舵�佷慨鏀逛负鍏ュ簱涓�
+ .setIoStatus(Short.parseShort("1"))
.setAnfme(sum)
.setBarcode(waitPakin.getBarcode());
if (!this.save(pakin)) {
@@ -89,7 +95,6 @@
.setMatnrCode(item.getMatnrCode())
.setBatch(item.getSplrBatch())
.setUnit(item.getStockUnit())
- .setBatch(item.getSplrBatch())
.setFieldsIndex(item.getFieldsIndex())
.setUnit(item.getStockUnit())
.setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
@@ -97,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("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
@@ -116,4 +121,39 @@
}
return pakin;
}
+
+ /**
+ * @author Ryan
+ * @description 缁勬嫋瑙ｇ粦
+ * @param
+ * @return
+ * @time 2025/3/29 14:42
+ */
+ @Override
+ public WaitPakin unBind(WaitPakinParam param) {
+ String barcode = param.getBarcode();
+ if (StringUtils.isNotBlank(barcode)) {
+ WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
+ if (Objects.isNull(waitPakins)) {
+ throw new CoolException("缁勬嫋涓嶅瓨鍦紒锛�");
+ }
+ List<PakinItem> paramItems = param.getItems();
+ if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
+ throw new CoolException("瑙ｇ粦鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
+ .eq(WaitPakinItem::getPakinId, waitPakins.getId())
+ .in(WaitPakinItem::getMatnrId, list));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
+ if (!waitPakinItemService.removeByIds(ids)) {
+ throw new CoolException("缁勬嫋鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+ }
+ return waitPakins;
+ }
+ return new WaitPakin();
+ }
}
--
Gitblit v1.9.1