From 3d7877c32b3bb7bcb1f0ce9b98e75b4980d0a22a Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 14 Jun 2022 01:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E4=BC=A0=E5=8F=82=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/controller/inout/OrderController.java | 2 ++
 .../com/glxp/api/admin/req/inout/OrderFilterRequest.java     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
index de111f57..598637cd 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
@@ -40,6 +40,7 @@ import com.glxp.api.admin.util.*;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -324,6 +325,7 @@ public class OrderController {
 
         if (orderEntity == null) {
             OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+            BeanUtils.copyProperties(updateExportStatusRequest, orderFilterRequest);
             orderFilterRequest.setOrderId(updateExportStatusRequest.getOrderId());
             orderFilterRequest.setWmsUserId(authAdmin.getId() + "");
             return spsDirectClient.reviewOrder(orderFilterRequest);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java
index d2203a34..18ba2923 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java
@@ -41,4 +41,9 @@ public class OrderFilterRequest extends ListPageRequest {
     private String wmsUserId;
     private String wmsUserName;
 
+    private Integer checkStatus;
+    private String stockOrderId;
+    private Integer entrustId;
+    private boolean entrust;
+
 }