From 3604a30d54f1a62ad344b7149455c5f4c3ca91f7 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 18 Jul 2022 10:48:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A1=A5=E5=BD=95=E5=8D=95=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E5=88=86=E5=BA=93=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/sale/admin/controller/inout/OrderController.java    | 3 ---
 .../java/com/glxp/sale/admin/service/inout/OrderService.java | 1 +
 .../src/main/resources/mybatis/mapper/inout/OrderDao.xml     | 5 ++++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
index 454bce8..596078a 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
@@ -116,8 +116,6 @@ public class OrderController {
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/inout/order/error")
     public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
-//        orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
-//        orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
         CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId()));
         if (StringUtils.isBlank(orderFilterRequest.getCustomerId()))
             return ResultVOUtils.success();
@@ -130,7 +128,6 @@ public class OrderController {
         }
         orderFilterRequest.setCustomerId(null);
 
-//        List<OrderEntity> orderEntityList = orderService.filterListOr(orderFilterRequest);
         List<OrderEntity> orderEntityList = orderService.filterList(orderFilterRequest);
         PageInfo<OrderEntity> pageInfo;
         pageInfo = new PageInfo<>(orderEntityList);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java
index 761eabc..3d24ec3 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java
@@ -120,4 +120,5 @@ public interface OrderService {
      * @param responseList
      */
     void queryInvName(List<StockOrderResponse> responseList);
+
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index 7a89185..29c3ae9 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -286,7 +286,10 @@
 
     <select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT io_order.* FROM io_order
+        SELECT io_order.* ,
+                inv_warehouse.name as invName,
+                inv_warehouse_sub.name as subInvName
+               FROM io_order
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`