From 296f1c190847ebefc779211320704ce502fa10d2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 14:42:08 +0800
Subject: [PATCH] #修改 1. 新增任务档 2. 新增任务档明细 3. 修改组拖接口源
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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 dfbcfe7..4a42f57 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
@@ -35,6 +35,9 @@
private AsnOrderItemService asnOrderItemService;
@Autowired
private AsnOrderService asnOrderService;
+
+ @Autowired
+ private WaitPakinService waitPakinService;
@Autowired
private WaitPakinItemService waitPakinItemService;
@@ -61,8 +64,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)) {
@@ -83,9 +87,12 @@
WaitPakinItem pakinItem = new WaitPakinItem();
pakinItem.setAnfme(item.getAnfme())
.setPakinId(pakin.getId())
- .setAnsId(item.getAsnId())
+ .setAsnId(item.getAsnId())
.setAsnCode(item.getAsnCode())
+ .setAsnItemId(item.getId())
+ .setMatnrCode(item.getMatnrCode())
.setBatch(item.getSplrBatch())
+ .setUnit(item.getStockUnit())
.setFieldsIndex(item.getFieldsIndex())
.setUnit(item.getStockUnit())
.setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
@@ -98,7 +105,7 @@
.setAnfme(waitPakinItem.getQty())
.setTrackCode(waitPakinItem.getTrackCode());
/**鏇存柊鍗曟嵁鎵ц涓簱瀛�*/
- if (v.compareTo(item.getQty()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
+ if (v.compareTo(item.getAnfme()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getTrackCode, waitPakinItem.getTrackCode()).set(AsnOrderItem::getWorkQty, v))) {
throw new CoolException("鎵ц涓簱瀛樻洿鏂板け璐ワ紒锛�");
@@ -112,4 +119,31 @@
}
return pakin;
}
+
+ @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())
+ .eq(WaitPakinItem::getMatnrId, list));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ if (!waitPakinItemService.removeByIds(pakinItems)) {
+ throw new CoolException("缁勬嫋鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+ }
+ return waitPakins;
+ }
+ return new WaitPakin();
+ }
}
--
Gitblit v1.9.1