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

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -43,6 +43,7 @@
                 <result column="op_app_code" property="opAppCode"/>
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <sql id="Base_Column_List_JOIN">
@@ -83,6 +84,7 @@
         <result column="cost_price" property="costPrice"/>
         <result column="priceInto" property="priceInto"/>
         <result column="intoQty" property="intoQty"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -178,6 +180,7 @@
         ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName"
         ,tmgus.unit_name         as "subUnitName"
         ,tmgu.unit_name         as "unitName"
+        ,tmgu.decimal_places    as "decimalPlaces"
         ,COALESCE((SELECT sum(tpi.usable_qty)  from dkic_b.t_psi_inventory tpi where tpi.sku_id = tmgs.sku_id and tpi.cp_id =  #{cpId} ),0) AS "usableQty"
         FROM dkic_b.t_mst_goods_sku  tmgs
         left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
@@ -208,6 +211,7 @@
         ,tmgb.brand_name AS "brandName"
            ,tmgc.cat_name AS "catName"
         ,tmu.unit_name AS "unitName"
+        ,tmgu.decimal_places    as "decimalPlaces"
         ,subtmu.unit_name AS "subUnitName"
         ,tmgsr.series_name AS "seriesName"
         ,(SELECT  count(1) FROM  dkic_b.t_psi_inventory tsic WHERE tsic.sku_id = tmgs.sku_id ) AS inventoryCount

src/main/java/com/dk/mdm/mapper/pur/PurchaseItemMapper.xml

@@ -452,6 +452,7 @@
         ,tppi.from_item_id  as "fromItemId"
         ,tpo.order_no  as "orderNo"
         ,tpp.pur_no as "purNo"
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_purchase_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_purchase_item tppi
         left join dkic_b.t_psi_order tpo on tpo.order_id = tppi.from_id
         left join dkic_b.t_psi_purchase tpp  on tpp.pur_id = tppi.pur_id

src/main/java/com/dk/mdm/model/pojo/mst/GoodsSku.java

@@ -297,6 +297,12 @@ public class GoodsSku extends PageInfo<GoodsSku> implements Serializable {
      * 相关属性
      * @TableField(exist = false)
      */
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     /*
      * 关联属性 + 查询条件

src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -369,6 +369,12 @@ public class GoodsSkuResponse implements Serializable {
      * 相关属性
      * @TableField(exist = false)
      */
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     /*
      * 关联属性 + 查询条件