From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 2b7b816..a6e2119 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
@@ -53,7 +53,7 @@
.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
- if (Objects.isNull(wkOrder)) {
+ if (!Objects.isNull(wkOrder)) {
throw new CoolException("鏀惰揣鍗曟嵁宸叉坊鍔狅紝鍒锋柊鍚庡啀鎿嶄綔锛侊紒");
}
@@ -70,7 +70,7 @@
BeanUtils.copyProperties(itemLog, item);
item.setId(itemLog.getAsnItemId())
.setOrderId(order.getId())
- .setMatnrId(Long.parseLong(itemLog.getMatnrId()))
+ .setMatnrId(itemLog.getMatnrId())
.setDeleted(0);
orderItems.add(item);
}
--
Gitblit v1.9.1