From 29db4e1548fb06aeea65b4427fed8b93f7fd006e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 19 Feb 2023 20:19:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E7=BB=88=E7=AB=AF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoOrderController.java | 2 +- src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 4 ++-- .../java/com/glxp/api/res/inout/PdaBusOrderResponse.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 93e0e8c5a..f164eb134 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -231,7 +231,7 @@ public class IoOrderController extends BaseController { if (CollUtil.isNotEmpty(orderResponses)) { for (IoOrderResponse orderResponse : orderResponses) { PdaBusOrderResponse pdaBusOrderResponse = new PdaBusOrderResponse(); - pdaBusOrderResponse.setOrderResponse(orderResponse); + BeanUtils.copyProperties(orderResponse, pdaBusOrderResponse); FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); filterOrderDetailBizRequest.setOrderIdFk(orderResponse.getBillNo()); List orderDetailBizEntities = orderDetailBizService.filterList(filterOrderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 08434accb..56b8c25f8 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -213,8 +213,8 @@ public class IoOrderResponse { if (StrUtil.isNotEmpty(fromCorpName)) return fromCorpName; - if (StrUtil.isNotEmpty(fromCorpName)) - return fromCorpName; + if (StrUtil.isNotEmpty(fromInvName)) + return fromInvName; return fromName; } } diff --git a/src/main/java/com/glxp/api/res/inout/PdaBusOrderResponse.java b/src/main/java/com/glxp/api/res/inout/PdaBusOrderResponse.java index 14a59a4b5..3ef075587 100644 --- a/src/main/java/com/glxp/api/res/inout/PdaBusOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/PdaBusOrderResponse.java @@ -5,9 +5,10 @@ import lombok.Data; import java.util.List; @Data -public class PdaBusOrderResponse { +public class PdaBusOrderResponse extends IoOrderResponse { - IoOrderResponse orderResponse; private List orderDetailBizResponses; + + }