From 1e01cb4da6055dd19c720a7012301ec34bee982a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 30 六月 2025 16:41:04 +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/controller/dto/OrderOutItemDto.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 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 f013f8a..e826316 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 @@ -4,18 +4,27 @@ 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; + @Data -public class OrderOutItemDto { - @Delegate +@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