From bc24d9dabb179dab8851b0013cd502ad51acd4b9 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 10 三月 2026 08:46:28 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 11 ++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemPdaDto.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemPdaDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemPdaDto.java
new file mode 100644
index 0000000..4524b7f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemPdaDto.java
@@ -0,0 +1,47 @@
+package com.vincent.rsf.server.manager.controller.dto;
+
+import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.utils.Synchro;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.experimental.Delegate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class OrderOutItemPdaDto {
+
+ @Delegate(types = LocItem.class)
+ private LocItem locItem;
+
+// @Delegate(types = Loc.class)
+// private Loc loc;
+
+// private List<LocItem> locItemList = new ArrayList<>();
+
+ private List<staListDto> staNos;
+ private List<String> targSiteAreaList;
+
+ private String targSiteAreaNow;
+
+ private String siteNo;
+
+ private String sourceId;
+
+ private String source;
+
+ @Data
+ public static class staListDto{
+ private String staNo;
+ private String staName;
+ }
+
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index e55acf5..33f3510 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.dto.ExistDto;
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
+import com.vincent.rsf.server.manager.controller.dto.OrderOutItemPdaDto;
import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
@@ -480,7 +481,15 @@
List<Long> itemIds = new ArrayList<>();
itemIds.add(orderItemId);
locItems = getOutOrderList(param.getOrderId(), waveRule,itemIds);
- return R.ok(locItems);
+ List<OrderOutItemPdaDto> locItemList = new ArrayList<>();
+ for (OrderOutItemDto locItem : locItems) {
+ for (LocItem locItem1 : locItem.getLocItemList()) {
+ OrderOutItemPdaDto orderOutItemPdaDto = new OrderOutItemPdaDto();
+ orderOutItemPdaDto.setLocItem(locItem1);
+ locItemList.add(orderOutItemPdaDto);
+ }
+ }
+ return R.ok(locItemList);
}
@Override
--
Gitblit v1.9.1