feature：明细合并

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -2027,13 +2027,16 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             return R.error("根据订单号未查询到明细行信息");
         }
         List<OrderItemInfo> collect ;
+        int itemCount = -1;
         if(itemList != null){
+            itemCount = itemList.size();
             collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList());
         }else{
+            itemCount = orderItemInfos.size();
             collect = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList());
         }
         //税编为空的不允许合并
-        if(itemList.size() != collect.size()){
+        if(itemCount != collect.size()){
             return R.error("税收编码为空的不允许合并，请先更新税收编码");
         }
         TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(orderInfo.getNsrsbh(), entId);