From a0c27ec444c85326efe3bacf3205dfecbd66451d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 22 四月 2025 09:28:39 +0800 Subject: [PATCH] #新增 1. 新增出库单明细 2. 编码规则bug修改 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 7687195..ee36323 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 @@ -129,6 +129,11 @@ .setUpdateBy(userId) .setCreateBy(userId) .setMatnrCode(item.getMatnrCode()); + AsnOrder order = asnOrderService.getById(item.getAsnId()); + if (!Objects.isNull(order)) { + pakinItem.setType(null == order.getType() ? null :order.getType()) + .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) ); + } for (PakinItem waitPakinItem : waitPakin.getItems()) { if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) { if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) { @@ -165,6 +170,12 @@ .setUpdateBy(userId) .setCreateBy(userId) .setMatnrCode(item.getMatnrCode()); + AsnOrder order = asnOrderService.getById(item.getAsnId()); + if (!Objects.isNull(order)) { + pakinItem.setType(null == order.getType() ? null :order.getType()) + .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) ); + } + for (PakinItem waitPakinItem : waitPakin.getItems()) { if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) { if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) { @@ -184,6 +195,9 @@ if (!this.updateById(waitPakin1)) { throw new CoolException("缁勬嫋鏁伴噺淇敼澶辫触锛侊紒"); } + + //TODO 缁勬嫋瀹屾垚鍚庯紝鎵e噺鏀惰揣鍖哄簱瀛� + return pakin; } -- Gitblit v1.9.1