2 コミット 586e6a2074 ... b32dd620be

作者 SHA1 メッセージ 日付
  liyuan b32dd620be Merge remote-tracking branch 'origin/master' 6 日 前
  liyuan 8cf8a35743 销售大屏数据不显示问题处理 6 日 前

+ 2 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/mapper/GoodsDescMapper.xml

@@ -57,10 +57,11 @@
           and find_in_set(code, #{goodsNo})
     </select>
     <select id="selectGoodsListBySaleSizeDetail" resultType="org.springblade.salesPart.entity.PjGoodsDesc">
-        select *
+        select id, goods_size
         from pjpf_goods_desc
         where is_deleted = 0
         and enable_or_not = 1
+        AND goods_size IS NOT NULL
         and tenant_id = #{tenantId}
         <if test="goodsIds != null and goodsIds.size > 0">
             and id in

+ 2 - 1
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -869,7 +869,8 @@
         SELECT
             poi.goods_id,
             poi.goods_num,
-            poi.returns_number
+            poi.returns_number,
+            brand_name
         FROM
             pjpf_order_items poi
                 LEFT JOIN pjpf_order po ON poi.pid = po.id