From 5c451346ea0c7d8750ecee019a76c8104e8d4d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Wed, 19 Jul 2023 15:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java | 1 +
 .../java/com/glxp/api/req/inv/InnerOrderDetailRequest.java   | 1 +
 src/main/java/com/glxp/api/res/inout/IoOrderResponse.java    | 2 +-
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml       | 5 ++++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 53633f2d7..84c717d56 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -197,4 +197,5 @@ public class FilterOrderRequest extends ListPageRequest {
     private String unionRemark;
 
     private String remark;
+    private Integer confirmStatus;
 }
diff --git a/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java
index bc8197b4f..fe067661d 100644
--- a/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java
@@ -9,5 +9,6 @@ public class InnerOrderDetailRequest extends ListPageRequest {
     private String orderIdFk;
     private String productId;
     private String billNo;
+    private String nameCode;
 
 }
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 28fa32531..4dff3b355 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@@ -230,7 +230,7 @@ public class IoOrderResponse {
 
     //总金额
     private BigDecimal allAmount;
-
+    private Integer confirmStatus;
 
     /**
      * 校验信息
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 1dd5be140..d12eb1efe 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -503,6 +503,9 @@
                      LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
                      LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
         <where>
+            <if test="confirmStatus != null and confirmStatus != ''">
+                AND io.checkStatus = #{confirmStatus}
+            </if>
             <if test="id != null and id != ''">
                 AND io.id = #{id}
             </if>
@@ -630,7 +633,7 @@
                 order by ${orderBy} ${sort}
             </when>
             <otherwise>
-                order by updateTime desc
+                order by checkStatus asc,updateTime desc
             </otherwise>
         </choose>
     </select>