From bd1d4feea4f9522c69ef4c0fd72b1221eae5201f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 14:41:06 +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 |    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