Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderController.java

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -146,7 +146,7 @@ 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) {
@@ -154,7 +154,7 @@ public class IoOrderController extends BaseController {
             }
             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) {
@@ -304,6 +304,8 @@ public class IoOrderController extends BaseController {
         if (checkInoutService.checkManual(addOrderRequest.getBillNo())) {
             if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
                 String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities);
+
+
                 if (StrUtil.isNotEmpty(errMsg)) {
                     return ResultVOUtils.error(500, errMsg);
                 }

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -575,6 +575,7 @@ public class IoOrderDetailBizController extends BaseController {
         FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
 
         filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
+        filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
 
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
 
@@ -583,9 +584,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);
 
 
     }

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -22,6 +22,8 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
 
     List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
+
     /**
      * 查询单据实体列表
      *

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -23,6 +23,8 @@ 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);
 

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -109,7 +109,7 @@ public class IoOrderInvoiceEntity {
     private Long bizIdFk;
 
     @TableField(exist = false)
-    private Integer regId;
+    private Long regId;
 
 
     @TableField(exist = false)

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -188,5 +188,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private String supInoivceSearch;
     private List<String> invoiceActions1;
     private List<String> invoiceActions2;
+    private String orderBy;
 
 }

src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java

@@ -99,5 +99,6 @@ public class PurOrderRequest extends ListPageRequest {
     private String startAuditDate;
     private String endAuditDate;
     private Integer dealStatus;
+    private String orderBy;
 
 }

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -38,6 +38,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);

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -56,6 +56,8 @@ public interface IoOrderService {
 
     List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
+
     /**
      * 查询单据列表
      *

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -132,6 +132,17 @@ 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<>();

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -546,6 +546,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) {

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -3,17 +3,17 @@
 <mapper namespace="com.glxp.api.dao.inout.IoOrderDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
         select io.*,
-               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+        (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
-               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+        (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
-               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+        (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
-               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+        (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
-               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+        (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
-               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+        (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
-               (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
+        (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
-               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
-               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
-               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
+        (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
-               (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
+        (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
         from io_order as io
         <where>
             <if test="id != null and id != ''">
@@ -21,7 +21,7 @@
             </if>
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
-                    concat('%', #{corpName}, '%')
+                concat('%', #{corpName}, '%')
             </if>
             <if test="action != null and action != ''">
                 AND action = #{action}
@@ -109,12 +109,12 @@
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
                     and (
-                            `action` in
+                    `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and status = 7
-                            )
+                    )
                 </if>
 
                 <if test="invoiceActions1 != null and invoiceActions2 != null">
@@ -123,13 +123,13 @@
                         #{item}
                     </foreach>
                     and status = 10)
-                            or (
+                    or (
-                            `action` in
+                    `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and status = 7)
-                            )
+                    )
                 </if>
             </if>
         </where>
@@ -274,12 +274,12 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
     </select>
 
 
 
 
+
     <select id="filterOrderList" resultType="com.glxp.api.entity.inout.IoOrderEntity">
         select *
         from io_order
@@ -330,7 +330,7 @@
                 ]]>
             </if>
         </where>
-        order by createTime desc
+
     </select>
 
 
@@ -407,4 +407,157 @@
         from io_order
         where billNo = #{billNo}
     </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>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -50,12 +50,10 @@
 
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT ic.*,
+        SELECT ic.*,cpmctymc,ggxh
-               (select cpmctymc from basic_products where basic_products.uuid = bu.uuid GROUP BY	basic_products.uuid) cpmctymc,
-               (select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY	basic_products.uuid)     ggxh
         FROM io_order_invoice ic
-                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
@@ -111,4 +109,28 @@
             </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>

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -102,5 +102,14 @@
                 AND createUser = #{createUser}
             </if>
         </where>
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by pur_order.updateTime desc
+            </otherwise>
+        </choose>
+
     </select>
 </mapper>