单据相关

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

@@ -82,6 +82,15 @@ public class IoOrderController extends BaseController {
         if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
             orderService.setInvoiceFiltes(filterOrderRequest);
         }
+
+        if (filterOrderRequest.getSourceLocalType() != null) {
+            if (filterOrderRequest.getSourceLocalType() == 1) {
+                filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));
+            } else {
+                filterOrderRequest.setSourceTypes(Arrays.asList(6,7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
+            }
+        }
+
         String customerId = getCustomerId();
         if (!customerId.equals("110")) {
             filterOrderRequest.setFromCorp(customerId);

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

@@ -411,7 +411,7 @@ public class IoOrderServiceImpl implements IoOrderService {
         }
 
 
-        orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+        orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
         orderEntity.setUpdateTime(new Date());
         update(orderEntity);
@@ -580,6 +580,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 .gt("spUse", 1).eq("actionType", 1).eq("enable", true));
         List<String> actions1 = null;
         actions1 = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(actions1))
             filterOrderRequest.setInvoiceActions1(actions1);
 
         List<BasicBussinessTypeEntity> bussinessTypeEntities2 = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
@@ -588,6 +589,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 .gt("spUse", 0).eq("actionType", 1).eq("enable", true));
         List<String> actions2 = null;
         actions2 = bussinessTypeEntities2.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(actions2))
             filterOrderRequest.setInvoiceActions2(actions2);
     }
 

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

@@ -65,6 +65,14 @@
                     #{item}
                 </foreach>
             </if>
+
+            <if test="sourceTypes != null and sourceTypes.size() != 0">
+                AND fromType in
+                <foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
             <if test="statuses != null and statuses.size() != 0">
                 AND status in
                 <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
@@ -98,7 +106,8 @@
                     </foreach>
                     and status = 10)
                 </if>
-                <if test="invoiceActions2 != null and invoiceActions2.size() != 0">
+
+                <if test="invoiceActions1 == null and invoiceActions2 != null">
                     or (
                             `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
@@ -107,6 +116,21 @@
                     and status = 7
                             ))
                 </if>
+
+                <if test="invoiceActions1 != null and invoiceActions2 != null">
+                    AND ((`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 10)
+                            or (
+                            `action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 7)
+                            )
+                </if>
             </if>
 
             <if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0 ">
@@ -122,7 +146,7 @@
                 </if>
             </if>
             <if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size()== 0 ">
-                <if test="invoiceActions1 != null and invoiceActions1.size() != 0">
+                <if test="invoiceActions1 != null and invoiceActions2 == null">
                     AND (`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}