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/AsnOrderItemServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index fed968f..4a033b9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -160,8 +160,8 @@
                     throw new CoolException(sbFaild.toString());
                 }
                 String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
-                orderItem.setAsnId(order.getId())
-                        .setAsnCode(order.getCode())
+                orderItem.setOrderId(order.getId())
+                        .setOrderCode(order.getCode())
                         .setSplrBatch(orderTemplate.getSplrBatch())
                         .setPlatItemId(orderTemplate.getPlatItemId())
                         .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))

--
Gitblit v1.9.1