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/controller/dto/OrderOutItemDto.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
index 19b2c3a..cd79ed4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
@@ -3,17 +3,27 @@
import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.utils.Synchro;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.experimental.Delegate;
import java.util.List;
-@EqualsAndHashCode(callSuper = true)
+
+
@Data
-public class OrderOutItemDto extends LocItem {
+@Accessors(chain = true)
+public class OrderOutItemDto {
-
+ @Delegate(types = LocItem.class)
+ private LocItem locItem;
private List<staListDto> staNos;
+ private String siteNo;
+
+ private String sourceId;
+
+ private String source;
+
@Data
public static class staListDto{
private String staNo;
--
Gitblit v1.9.1