From ecdc2cadd4a21b80de4e30e38878fdeb39084e3f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 23 六月 2025 17:05:12 +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 | 13 ++++++++++--- 1 files changed, 10 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 19b2c3a..17feb1e 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,16 +4,23 @@ 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; + @Data public static class staListDto{ private String staNo; -- Gitblit v1.9.1