From 25f91c2eb2e458ee065e787bd547f8fe0625e918 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 85dc13f..2b7b816 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
@@ -69,7 +69,7 @@
WkOrderItem item = new WkOrderItem();
BeanUtils.copyProperties(itemLog, item);
item.setId(itemLog.getAsnItemId())
- .setAsnId(order.getId())
+ .setOrderId(order.getId())
.setMatnrId(Long.parseLong(itemLog.getMatnrId()))
.setDeleted(0);
orderItems.add(item);
--
Gitblit v1.9.1