From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +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/AsnOrderLogServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
index 440a2b5..3836921 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
@@ -51,6 +51,12 @@
order.setId(orderLog.getAsnId())
.setDeleted(0)
.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+
+ AsnOrder asnOrder = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, orderLog.getCode()));
+ if (Objects.isNull(asnOrder)) {
+ throw new CoolException("鏀惰揣鍗曟嵁宸叉坊鍔狅紝鍒锋柊鍚庡啀鎿嶄綔锛侊紒");
+ }
+
if (!asnOrderService.saveOrUpdate(order)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
@@ -64,6 +70,7 @@
BeanUtils.copyProperties(itemLog, item);
item.setId(itemLog.getAsnItemId())
.setAsnId(order.getId())
+ .setMatnrId(Long.parseLong(itemLog.getMatnrId()))
.setDeleted(0);
orderItems.add(item);
}
--
Gitblit v1.9.1