Merge branch 'feature/cpy_splite' into test

2 years ago · 9b84d9e87c
parent 4d760bf438 4b8a269b0c
commit 9b84d9e87c
1 changed files with 3 additions and 1 deletions
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
@ -251,8 +251,10 @@ public class InvoiceServiceImpl implements InvoiceService {
            if(cpyOrderItems.size()>ConfigureConstant.INT_8){
                return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!");
            }
+            if(!CollectionUtils.isEmpty(mixCommonOrderInfoList)){
                lists.add(mixCommonOrderInfoList);
            }
+        }

        //如果是混开的 走明细拆分
        if(!CollectionUtils.isEmpty(lists)){