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 + + AND io.checkStatus = #{confirmStatus} + AND io.id = #{id} @@ -630,7 +633,7 @@ order by ${orderBy} ${sort} - order by updateTime desc + order by checkStatus asc,updateTime desc