dongke 1 рік тому
батько
коміт
ca84a17df8

+ 1 - 1
src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3374,7 +3374,7 @@
 
     <!-- 销售汇总明细 -->
     <select id="getOrderSummaryItem" resultType="java.util.Map">
-        select dkic_b.f_get_order_summary_item(#{cpId}, #{querys, typeHandler=JsonTypeHandler})
+        select dkic_b.f_get_order_summary_item(#{cpId}, #{querys, typeHandler=JsonTypeHandler}, #{lang})
     </select>
 
     <!--endregion-->

+ 4 - 0
src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -111,6 +111,8 @@
         <result column="skuModel" property="skuModel"/>
         <result column="skuName" property="skuName"/>
         <result column="can_out_qty" property="canOutQty"/>
+        <result column="cost_price" property="costPrice"/>
+        <result column="cost_amt" property="costAmt"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -461,6 +463,8 @@
                ,u2.unit_name as "subUnitName"
                ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tpobi.outing_box,tpobi.outing_piece) AS "outingBoxPiece"
                ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tpobi.out_box,tpobi.out_piece) AS "outBoxPiece"
+               ,tpobi.cost_price
+               ,tpobi.cost_amt
         FROM dkic_b.t_psi_outbound_item as tpobi
                  inner join dkic_b.t_psi_order_item as t on t.item_id = tpobi.from_item_id
                  LEFT join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id

+ 12 - 0
src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -434,6 +434,18 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
     @ApiModelProperty(value = "能出库数量")
     private BigDecimal canOutQty;
+    /**
+     * 成本单价
+     */
+    @ApiModelProperty(value = "成本单价")
+    private BigDecimal costPrice;
+
+
+    /**
+     * 成本金额
+     */
+    @ApiModelProperty(value = "成本金额")
+    private BigDecimal costAmt;
 
     private static final long serialVersionUID = 1L;