Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -55,6 +55,7 @@
         <result column="fact_amt" property="factAmt"/>
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
+        <result column="sup_id" property="supId"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -96,6 +97,7 @@
         <result column="fact_amt" property="factAmt"/>
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
+        <result column="sup_id" property="supId"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -341,8 +343,8 @@
                t.item_index,
                t.sku_id,
                tmgs.sku_code                              as "skuCode",
-               tmgs.sku_model                             as "skuModel",
-               tmgs.sku_name                              as "skuName",
+               t.sku_model                             as "skuModel",
+               t.sku_name                              as "skuName",
                tmgs.sku_images AS "skuImages",
                t.pack_box  ,
                sys.f_remove_zero(t.item_qty)              as "orderQty",

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -211,6 +211,7 @@
         <result column="flg_handle_setting" property="flgHandleSetting"/>
         <result column="channelName" property="channelName"/>
         <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
+        <result column="categoryCount" property="categoryCount"/>
         <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
 
     </resultMap>
@@ -1051,10 +1052,13 @@
         tmsc.channel_name as "channelName",
 
         <include refid="Base_Column_List_Item_Response_Detail_Join"/>
+        ,(select count(DISTINCT tmgss.category_id) from dkic_b.t_psi_order_item ti
+                LEFT  JOIN dkic_b.t_mst_goods_sku tmgss ON tmgss.sku_id = ti.sku_id
+                where ti.order_id = t.order_id and ti.flg_valid) as "categoryCount"
         FROM dkic_b.t_psi_order as t
         left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.cus_id
         left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
-        inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
         left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
         left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -411,6 +411,12 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "折扣")
     private BigDecimal discount;
 
+    /**
+     * 供应商Id
+     */
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -429,6 +429,9 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     @ApiModelProperty(value = "开单并出库办理标识")
     private Boolean outboundProcessingFlag;
 
+    @ApiModelProperty(value = "种类数")
+    private BigDecimal categoryCount;
+
 
     private static final long serialVersionUID = 1L;