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 5ce7fe7d5..299927aa7 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -51,9 +51,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-
 import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
-import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_PROCESSING;
 
 
 @Slf4j
@@ -142,14 +140,14 @@ public class IoOrderController extends BaseController {
         if (!customerId.equals("110")) {
             filterOrderRequest.setFromCorp(customerId);
         }
-        List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
+        List<IoOrderResponse> list = orderService.getfilterOrderList(filterOrderRequest);
         for (IoOrderResponse ioOrderResponse : list) {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
             FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
             filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
-            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
+            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(filterOrderDetailCodeRequest);
             BigDecimal amount = new BigDecimal(0.00);
             for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
                 if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index d9f41eec0..294eebc49 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -571,6 +571,7 @@ public class IoOrderDetailBizController extends BaseController {
         FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
 
         filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
+        filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
 
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
 
@@ -580,9 +581,11 @@ public class IoOrderDetailBizController extends BaseController {
         List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest);
         if (list.size() == 0) {
             ioOrderDetailBizEntity.setRegStatus(false);
+        }else{
+            ioOrderDetailBizEntity.setRegStatus(true);
         }
         orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(list);
 
     }
 
diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
index 4755e859d..0f42d4a24 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java
@@ -22,6 +22,9 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
 
     List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
+
+
     /**
      * 查询单据实体列表
      *
diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
index 311bbd21e..48ec354af 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
@@ -23,6 +23,9 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
+
+    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java
index a332a5884..04b00a75b 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java
@@ -107,7 +107,7 @@ public class IoOrderInvoiceEntity {
     private Long bizIdFk;
 
     @TableField(exist = false)
-    private Integer  regId;
+    private Long  regId;
 
 
     @TableField(exist = false)
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
index 3adee5a47..b2512d94c 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
@@ -39,6 +39,8 @@ public interface IoOrderDetailBizService {
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
+    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+
     IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
 
     List<IoOrderDetailBizEntity> checkOrderList(String orderId);
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
index a9e69f313..1d4fcf23f 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java
@@ -60,6 +60,8 @@ public interface IoOrderService {
 
     List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
+
     /**
      * 查询单据列表
      *
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
index 457abea9a..e1077961a 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
@@ -130,6 +130,16 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest);
     }
 
+    @Override
+    public List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
+        if (null == OrderDetailCodeRequest) {
+            return Collections.emptyList();
+        }
+        if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
+            PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest);
+    }
     @Override
     public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) {
         QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index e3d18a38e..36d9f1e19 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -572,6 +572,17 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.getfilterList(filterOrderRequest);
     }
 
+    @Override
+    public List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest) {
+        if (null == filterOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        }
+        return orderDao.getfilterOrderList(filterOrderRequest);
+    }
+
     @Override
     public List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest) {
         if (null == filterOrderRequest) {
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index dbae1ed54..b75859c3e 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -470,4 +470,151 @@
         AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{lastData}, '%Y-%m-%d') and
         date_format(#{firstData}, '%Y-%m-%d')
     </select>
+
+
+    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        SELECT
+        io.*,
+        bus.NAME AS billTypeName,
+        ad.NAME AS deptName,
+        aw.NAME AS invName,
+        bc.NAME AS fromCorpName,
+        COUNT(IF(dc.regStatus = 1, 1, NULL)) AS allCout,
+        COUNT(IF(dc.regStatus = 0, 1, NULL)) AS partCount
+        FROM
+        io_order io
+        LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
+        LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
+        LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
+        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="id != null and id != ''">
+                AND io.id = #{id}
+            </if>
+            <if test="corpName != null and corpName != ''">
+                AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
+                concat('%', #{corpName}, '%')
+            </if>
+            <if test="action != null and action != ''">
+                AND io.action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND io.mainAction = #{mainAction}
+            </if>
+            <if test="billNo != null and billNo != ''">
+                AND io.billNo like concat('%', #{billNo}, '%')
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND io.corpOrderId = #{corpOrderId}
+            </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND io.fromCorp = #{fromCorp}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND io.deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND io.invCode = #{invCode}
+            </if>
+            <if test="busType != null">
+                AND io.busType = #{busType}
+            </if>
+            <if test="inCodeStatus != null">
+                AND io.inCodeStatus = #{inCodeStatus}
+            </if>
+            <if test="relKey != null">
+                AND io.relKey = #{relKey}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+            <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
+                AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
+            </if>
+            <if test="actions != null and actions.size() != 0">
+                AND io.`action` in
+                <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="sourceTypes != null and sourceTypes.size() != 0">
+                AND io.fromType in
+                <foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="statuses != null and statuses.size() != 0">
+                AND io.status in
+                <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dealStatuses != null and dealStatuses.size() != 0">
+                AND io.dealStatus in
+                <foreach collection="dealStatuses" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="orderIds != null and orderIds.size() != 0">
+                AND io.billNo in
+                <foreach collection="orderIds" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="status != null">
+                AND io.status = #{status}
+            </if>
+            <if test="orderType != null">
+                AND io.orderType = #{orderType}
+            </if>
+
+            <if test="supInoivceSearch != null">
+                <if test="invoiceActions1 != null and invoiceActions2 == null">
+                    AND (io.`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 10)
+                </if>
+
+                <if test="invoiceActions1 == null and invoiceActions2 != null">
+                    and (
+                    io.`action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 7
+                    )
+                </if>
+
+                <if test="invoiceActions1 != null and invoiceActions2 != null">
+                    AND ((io.`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 10)
+                    or (
+                    io.`action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 7)
+                    )
+                </if>
+            </if>
+        </where>
+        GROUP BY io.id
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
+    </select>
+
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index 3519d3172..969908180 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -57,12 +57,10 @@
     </select>
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT ic.*,
-               bp.cpmctymc,
-               bp.ggxh
+        SELECT ic.*,cpmctymc,ggxh
         FROM io_order_invoice ic
-                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
@@ -113,4 +111,29 @@
             </if>
         </where>
     </select>
+
+    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
+        select io_order_detail_code.*,
+        (select count(*)
+        FROM io_order_invoice
+        where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
+        from io_order_detail_code
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relId != null">
+                AND bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="productName != null and productName != ''">
+                AND bp.cpmctymc like concat('%', #{productName}, '%')
+            </if>
+        </where>
+        group by io_order_detail_code.id
+    </select>
+
+
 </mapper>