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

src/main/java/com/dk/mdm/mapper/ivt/CheckItemMapper.xml

@@ -56,6 +56,7 @@ flg_valid, cp_id,
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
                 <result column="o_inv_qty" property="oInvQty"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 盘点一览查询映射结果 -->
@@ -90,6 +91,7 @@ flg_valid, cp_id,
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
         <result column="o_inv_qty" property="oInvQty"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -183,6 +185,7 @@ flg_valid, cp_id,
         SELECT
         <include refid="Base_Column_List_Response"/>
         ,sku.sku_images
+        ,ul.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_check_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
         LEFT JOIN dkic_b.t_mst_unit AS ul ON item.unit_id = ul.unit_id
@@ -210,6 +213,7 @@ flg_valid, cp_id,
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_check_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_check_item
         WHERE item_id = #{id}::uuid
     </select>
@@ -219,6 +223,7 @@ flg_valid, cp_id,
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_psi_check_item
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_check_item.unit_id = ul.unit_id) as "decimalPlaces"
         WHERE item_id = #{itemId}
         for update
     </select>
@@ -228,6 +233,7 @@ flg_valid, cp_id,
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_psi_check_item
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_check_item.unit_id = ul.unit_id) as "decimalPlaces"
         <include refid="idsForeach"/>
         for update
     </select>

src/main/java/com/dk/mdm/mapper/ivt/FreezeItemMapper.xml

@@ -47,6 +47,7 @@
         <result column="sku_spec" property="skuSpec"/>
         <result column="non_std_code" property="nonStdCode"/>
         <result column="pack_box" property="packBox"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -74,6 +75,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>
 
     <!-- 通用条件列 -->
@@ -120,6 +122,7 @@
         ,sku.sku_spec
         ,inv.non_std_code
         ,sku.pack_box
+        ,ul.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_freeze_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
         LEFT JOIN dkic_b.t_mst_unit AS ul ON item.unit_id = ul.unit_id
@@ -143,6 +146,7 @@
         SELECT
             item.item_id, item.freeze_id, item.item_index, item.sku_id, item.freeze_qty, item.unfreeze_qty
              , item.surplus_qty, item.remarks, item.inv_id, item.flg_valid,item.cp_id
+           ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_freeze_item AS item
         WHERE item.item_id = #{id}::uuid
     </select>
@@ -152,7 +156,8 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_freeze_item
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_freeze_item.unit_id = ul.unit_id) as "decimalPlaces"
+        FROM dkic_b.t_psi_freeze_item
         WHERE item_id = #{id}::uuid
         for update
     </select>

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -246,6 +246,7 @@
         ,tmgs.flg_sub_unit
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpii.intoing_box,tpii.intoing_piece) as "ingBoxPiece"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpii.into_box,tpii.into_piece) as "boxPiece"
+        ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_mst_unit as tmgu on tpii.unit_id = tmgu.unit_id
         left join dkic_b.t_mst_unit as tmgus on tpii.sub_unit_id = tmgus.unit_id
@@ -278,6 +279,7 @@
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where tpii.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item tpii
         WHERE tpii.item_id = #{id}::uuid
     </select>
@@ -286,6 +288,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_inbound_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item
         WHERE item_id = #{itemId}
         for update
@@ -295,6 +298,7 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_inbound_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item
         <include refid="idsForeach"/>
         for update
@@ -457,6 +461,7 @@
         ,tmu.unit_name as "unitName"
         ,tmu2.unit_code as "subUnitCode"
         ,tmu2.unit_name as "subUnitName"
+        ,tmu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item tpii
         <include refid="Select_Inbound_Join_Table_Into"/>
         <where>
@@ -479,6 +484,7 @@
         ,tmu.unit_name as "unitName"
         ,tmu2.unit_code as "subUnitCode"
         ,tmu2.unit_name as "subUnitName"
+        ,tmu.decimal_places    as "decimalPlaces"
         from dkic_b.t_psi_outbound_item tpoi
         <include refid="Select_Inbound_Join_Table_Out"/>
         <where>
@@ -553,6 +559,7 @@
 
         ,sys.f_remove_zero(tpi.usable_qty) AS "usableQty"
         ,tpi.non_std_code AS "nonStdCode"
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_inbound_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
@@ -588,6 +595,7 @@
         ,tmp.sup_code as "supCode"
         ,tmp.sup_name as "supName"
         ,sys.f_remove_zero(tpiv.inv_qty)  as inv_qty
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where tpii.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_psi_inbound tpid on tpii.into_id = tpid.into_id
         left join dkic_b.t_psi_inventory tpiv on tpiv.inv_id = tpii.inv_id

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnItemMapper.xml

@@ -55,6 +55,7 @@
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
         <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.ivt.IntoReturnItemResponse">
@@ -86,6 +87,7 @@
         <result column="sku_images" property="skuImages"/>
         <result column="reject_qty" property="rejectQty"/>
         <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
 

src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -39,6 +39,7 @@
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
                 <result column="freeze_qty" property="freezeQty"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
     <!-- 通用查询映射结果Response -->
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.ivt.InventoryResponse">
@@ -75,7 +76,7 @@
         <result column="catName" property="catName"/>
         <result column="price_other" property="priceOther"/>
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
-
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -173,6 +174,7 @@
         ,tmw.wh_name
         ,tmgc.cat_name as "catName"
         ,tmgseries.series_name as "seriesName"
+        ,tmu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_inventory tpi
         <include refid="Join_Table"/>
         <include refid="Condition"/>
@@ -212,7 +214,10 @@
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,tmu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_inventory tpi
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpi.sku_id
+        LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
         WHERE tpi.inv_id = #{id}::uuid
     </select>
 
@@ -277,7 +282,10 @@
     <select id="selectByOther" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,tmu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_inventory tpi
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpi.sku_id
+        LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
         <where>
             <if test="whId != null and whId != ''">
                 AND tpi.wh_id = #{whId}::uuid

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -69,6 +69,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         <result column="pack_box" property="packBox"/>
         <result column="sku_name" property="skuName"/>
         <result column="sku_model" property="skuModel"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -131,7 +132,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         <result column="subUnitName" property="subUnitName"/>
         <result column="unitName" property="unitName"/>
         <result column="use_place" property="usePlace"/>
-
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -252,6 +253,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         tmgb.short_name  as "shortName",
         tmgs.sku_spec  as "skuSpec",
         sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "outStatusName"
+        ,ul.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item as tpoi
         LEFT JOIN dkic_b.t_mst_unit AS ul ON tpoi.unit_id = ul.unit_id
         LEFT JOIN dkic_b.t_mst_unit AS u2 ON tpoi.sub_unit_id = u2.unit_id
@@ -283,6 +285,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where tpoi.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item tpoi
         WHERE tpoi.item_id = #{id}::uuid
     </select>
@@ -291,6 +294,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_outbound_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item
         WHERE item_id = #{id}::uuid
         for update
@@ -300,6 +304,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_outbound_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item
         <include refid="idsForeach"/>
         for update
@@ -309,6 +314,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
     <select id="selectByZIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_outbound_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item
         WHERE out_id = #{id}::uuid
         for update
@@ -412,6 +418,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(tpi.usable_qty)                                                            as "usableQty",
                tmw.wh_name                                                               as "whName",
                t.use_place
+                ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_psi_order_item as tpoi on tpoi.item_id = t.from_item_id
                  left join dkic_b.t_psi_order as tpo on tpo.order_id = t.from_id
@@ -452,8 +459,10 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(tpi.inv_qty)             as "invQty",
                sys.f_remove_zero(tpi.usable_qty)           as "usableQty",
                tmw.wh_name              as "whName"
+                ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
+                 left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
         where t.flg_valid
@@ -479,8 +488,10 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                t.inv_id,
                t.non_std_code,
                t.remarks
+                ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item as t
                  inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
+                 left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
         where t.flg_valid
           and t.out_type = '出库类型-销售出库'
           and t.out_qty > t.return_qty
@@ -516,6 +527,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                t.outing_amt + t.out_amt                                                              as outing_amt,
                t.non_std_code,
                t.remarks
+                ,tmgu.decimal_places    as "decimalPlaces"
                 ,tmgus.unit_name         as "subUnitName"
                 ,tmgu.unit_name         as "unitName"
                 ,t.pack_box
@@ -528,6 +540,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
+                 left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
@@ -568,8 +581,10 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                t.out_amt,
             t.non_std_code,
                t.remarks
+                ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
+                 left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
@@ -665,6 +680,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         ,tmu2.unit_code as "subUnitCode"
         ,tmu2.unit_name as "subUnitName"
         ,dkic_b.f_box_piece(tmu2.unit_name,tmu.unit_name,tpoi.outing_box,tpoi.outing_piece) as "outingBoxPiece"
+        ,tmu.decimal_places    as "decimalPlaces"
         from dkic_b.t_psi_outbound_item tpoi
         <include refid="Select_Inbound_Join_Table_Out"/>
         <where>
@@ -687,6 +703,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         ,tmu2.unit_code as "subUnitCode"
         ,tmu2.unit_name as "subUnitName"
         ,dkic_b.f_box_piece(tmu2.unit_name,tmu.unit_name,tpoi.out_box,tpoi.out_piece) as "outBoxPiece"
+        ,tmu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_inbound_item tpii
         <include refid="Select_Inbound_Join_Table_Into"/>
         <where>

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -1071,7 +1071,7 @@
                 left join dkic_b.t_psi_inventory tpi on tpi.inv_id = tpoi.inv_id
                 left join dkic_b.t_mst_unit as tmgu on tpoi.unit_id = tmgu.unit_id
                 left join dkic_b.t_mst_unit as tmgus on tpoi.sub_unit_id = tmgus.unit_id
-        inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = tpoi.sku_id
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = tpoi.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
         left join dkic_b.t_psi_inventory tpity on tpity.inv_id  = tpoi.inv_id
         left join dkic_b.t_mst_warehouse as tmw on tpity.wh_id = tmw.wh_id

src/main/java/com/dk/mdm/mapper/ivt/TransferItemMapper.xml

@@ -49,6 +49,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>
 
     <!-- 一览查询映射结果 -->
@@ -81,6 +82,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="Condition">
@@ -164,6 +166,7 @@
     <select id="selectByCond" resultMap="BaseResultMap_Response">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,ul.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_transfer_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
         LEFT JOIN dkic_b.t_mst_unit AS ul ON item.unit_id = ul.unit_id
@@ -191,6 +194,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_transfer_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_transfer_item
         WHERE item_id = #{id}::uuid
     </select>
@@ -199,6 +203,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_transfer_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_transfer_item
         WHERE item_id = #{itemId}
         for update

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

@@ -82,6 +82,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>
 
     <!-- Response通用查询映射结果 -->
@@ -127,6 +128,7 @@
         <result column="flg_sub_unit" property="flgSubUnit"/>
         <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="specsName" property="specsName"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
 
@@ -341,6 +343,7 @@
         ,tppi.intoing_qty%tppi.pack_box as "intoingPiece"
         ,tppi.into_qty/tppi.pack_box as "intoBox"
         ,tppi.into_qty%tppi.pack_box as "intoPiece"
+        ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_purchase_item tppi
         left join(SELECT T.*
         FROM (select tpi.inv_id,
@@ -395,6 +398,7 @@
         ,tmgus.unit_name         as "subUnitName"
         ,tmgu.unit_name         as "unitName"
         ,tmgs.flg_sub_unit
+        ,tmgu.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_purchase_item tppi
         left join dkic_b.t_mst_unit as tmgu on tppi.unit_id = tmgu.unit_id
         left join dkic_b.t_mst_unit as tmgus on tppi.sub_unit_id = tmgus.unit_id
@@ -460,6 +464,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(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
         WHERE item_id = #{itemId}::uuid
         for update

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

@@ -48,6 +48,7 @@
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
                 <result column="wh_id" property="whId"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -84,6 +85,7 @@
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
                 <result column="transferableQuantity" property="transferableQuantity"/>
                 <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -193,6 +195,7 @@
                t.remarks,
                t.wh_id,
                 tmw.wh_name
+        ,ul.decimal_places    as "decimalPlaces"
         FROM dkic_b.t_psi_order_item as t
                  inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
                  LEFT JOIN dkic_b.t_mst_unit AS ul ON tmgs.unit_id = ul.unit_id
@@ -218,6 +221,7 @@
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item t
         WHERE t.item_id = #{id}::uuid
     </select>
@@ -226,6 +230,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item
         WHERE item_id = #{id}::uuid
         for update
@@ -235,6 +240,7 @@
     <select id="selectByZIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item
         WHERE order_id = #{id}::uuid
         for update
@@ -244,6 +250,7 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item
         <include refid="idsForeach"/>
         for update
@@ -338,6 +345,7 @@
                tpi.inv_id                                 as "invId",
                sys.f_remove_zero(tpi.inv_qty)                                as "invQty",
                sys.f_remove_zero(tpi.usable_qty)                             as "usableQty"
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item as t
                  inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
                  left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = t.wh_id
@@ -372,6 +380,7 @@
                tpobi.remarks,
                t.wh_id,
                tmw.wh_name
+                ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         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
                  inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
@@ -559,6 +568,7 @@
         t.return_amt,
         t.remarks,
         t.item_qty - coalesce(sumQty,0) as "transferableQuantity"
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id

src/main/java/com/dk/mdm/model/pojo/ivt/CheckItem.java

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

src/main/java/com/dk/mdm/model/pojo/ivt/FreezeItem.java

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

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -358,7 +358,12 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     @ApiModelProperty(value = "包装")
     private Integer packBox;
 
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/pojo/ivt/IntoReturnItem.java

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

src/main/java/com/dk/mdm/model/pojo/ivt/Inventory.java

@@ -206,7 +206,12 @@ public class Inventory extends PageInfo<Inventory> implements Serializable {
     @Excel(name = "冻结数量")
     @ApiModelProperty(value = "冻结数量")
     private BigDecimal freezeQty;
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -353,7 +353,12 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @ApiModelProperty(value = "包装")
     private Integer packBox;
 
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/pojo/ivt/TransferItem.java

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

src/main/java/com/dk/mdm/model/pojo/pur/PurchaseItem.java

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

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -240,6 +240,13 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/ivt/CheckItemResponse.java

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

src/main/java/com/dk/mdm/model/response/ivt/FreezeItemResponse.java

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

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -497,7 +497,12 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "包装数量")
     private String ingBoxPiece;
 
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/ivt/IntoReturnItemResponse.java

@@ -281,6 +281,13 @@ public class IntoReturnItemResponse  {
     @ApiModelProperty(value = "可退数量")
     private BigDecimal rejectQty;
 
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/ivt/InventoryResponse.java

@@ -278,7 +278,12 @@ public class InventoryResponse {
     @TableField(exist = false)
     @ApiModelProperty(value = "辅助单位标识")
     private Boolean flgSubUnit;
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -378,6 +378,13 @@ public class OutboundItemResponse {
 
     private Boolean flgSubUnit;
 
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/ivt/TransferItemResponse.java

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

src/main/java/com/dk/mdm/model/response/pur/PurchaseItemResponse.java

@@ -437,7 +437,12 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "片（已入库）")
     private  Integer intoPiece;
 
-
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -352,6 +352,13 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(typeHandler = JsonTypeHandler.class)
     private JSONArray skuImages;
 
+    /**
+     * 小数位数 ([0-6]能改大，不能改小)
+     */
+    @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
+    @TableField(exist = false)
+    private Integer decimalPlaces;
+
     private static final long serialVersionUID = 1L;
 
 }