Merge branch 'feature/relation_type_item' into feature/push_invoice

# Conflicts:
#	sp-admin/sa-view/tb-invoice-info/tb-invoice-info-list.html

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemMapper.xml

@@ -58,6 +58,7 @@
         from tb_business_item a,tb_business b where a.business_id=b.id
         <if test=' this.has("id") '>and a.id = #{id}</if>
         <if test=' this.has("goodsId") '>and b.goods_id = #{goodsId}</if>
+        <if test=' this.has("businessNo") '>and b.no = #{businessNo}</if>
         <if test=' this.has("businessId") '>and a.business_id = #{businessId}</if>
         <if test=' this.has("pickCustomerId") '>and a.pick_customer_id = #{pickCustomerId}</if>
         <if test=' this.has("itemCode") '>and a.item_code = #{itemCode}</if>

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemService.java

@@ -102,13 +102,6 @@ public class TbBusinessItemService extends ServiceImpl<TbBusinessItemMapper, TbB
      * 查集合 - 根据条件（参数为空时代表忽略指定条件）
      */
     public List<TbBusinessItem> getList(SoMap so) {
-        String businessNo = so.getString("businessNo");
-        if(StrUtil.isNotEmpty(businessNo)){
-            TbBusiness business = tbBusinessService.findByNo(businessNo);
-            if(business != null){
-                so.put("businessId", business.getId());
-            }
-        }
         return tbBusinessItemMapper.getList(so);
     }