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

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

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1047,6 +1047,8 @@
                tmw.wh_code            as "whCode",
                tmw.wh_name            as "whName",
                tmgs.pack_box          as "packBox",
+               tmgs.unit_id           as "unitId",
+               tmgs.sub_unit_id       as "subUnitId",
                dkic_b.f_get_last_ivt_price(tpi.inv_id,null,null,null) as "priceInto",
                tpi.remarks
         from dkic_b.t_psi_inventory as tpi

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

@@ -5,13 +5,13 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, check_id, item_index, sku_id, inv_id, inv_qty, box, piece, check_qty, balance_qty, staff_id, loss_reason, check_date, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, o_inv_qty
+        item_id, check_id, item_index, sku_id, inv_id, inv_qty, sub_unit_id, unit_id,pack_box,box, piece, check_qty, balance_qty, staff_id, loss_reason, check_date, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, o_inv_qty
     </sql>
 
     <!-- 盘点一览通用查询列 -->
     <sql id="Base_Column_List_Response">
         item.item_id,item.check_id,item.inv_id
-        ,item.inv_qty,item.o_inv_qty,item.box,item.piece
+        ,item.inv_qty,item.o_inv_qty,item.box,item.piece,item.sub_unit_id,item.unit_id,item.pack_box
         ,item.check_qty,item.balance_qty,item.staff_id
         ,item.loss_reason,item.check_date,item.remarks,item.flg_valid,item.cp_id
         ,sku.sku_code,sku.sku_name,sku.sku_model,brand.short_name,wh.wh_name
@@ -19,7 +19,7 @@
         ,item.sku_id,inv.wh_id,inv.non_std_code,item.item_id AS "fromItemId"
         ,item.check_id AS "fromId",item.item_index,item.balance_qty AS "intoingQty"
         ,abs(item.balance_qty) AS "outingQty",item.price_into,item.intoing_amt
-        ,0 AS "priceOut"
+        ,0 AS "priceOut",dkic_b.f_box_piece(u2.unit_name,ul.unit_name,item.box,item.piece) AS "boxPiece"
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -29,6 +29,9 @@
                 <result column="item_index" property="itemIndex"/>
                 <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
                 <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
+                <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+                <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+                <result column="pack_box" property="packBox"/>
                 <result column="inv_qty" property="invQty"/>
                 <result column="box" property="box"/>
                 <result column="piece" property="piece"/>
@@ -59,6 +62,9 @@
         <result column="item_index" property="itemIndex"/>
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
         <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
+        <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+        <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+        <result column="pack_box" property="packBox"/>
         <result column="inv_qty" property="invQty"/>
         <result column="box" property="box"/>
         <result column="piece" property="piece"/>
@@ -176,6 +182,8 @@
         ,sku.sku_images
         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 sku.unit_id = ul.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS u2 ON sku.sub_unit_id = u2.unit_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
         LEFT JOIN dkic_b.t_mst_goods_brand AS brand ON brand.brand_id=sku.brand_id

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

@@ -5,12 +5,13 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, freeze_id, item_index, sku_id, box, piece, freeze_qty, unfreeze_qty, surplus_qty, remarks, inv_id, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, freeze_id, item_index, sku_id,sub_unit_id, unit_id,pack_box, box, piece, freeze_qty, unfreeze_qty, surplus_qty, remarks, inv_id, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
     <!-- 通用Respons查询列 -->
     <sql id="Base_Column_List_Respons">
         item.item_id, item.freeze_id, item.item_index, item.sku_id,item.box,item.piece,item.freeze_qty, item.unfreeze_qty, item.surplus_qty, item.remarks, item.inv_id, item.flg_valid
         ,item.cp_id, sku.sku_code, sku.sku_name, sku.sku_model,brand.short_name,wh.wh_name
+        ,item.sub_unit_id,item.unit_id,item.pack_box,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,item.box,item.piece) AS "boxPiece"
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -19,6 +20,9 @@
                 <result column="freeze_id" property="freezeId" typeHandler="UuidTypeHandler"/>
                 <result column="item_index" property="itemIndex"/>
                 <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+                <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+                <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+                <result column="pack_box" property="packBox"/>
                 <result column="box" property="box"/>
                 <result column="piece" property="piece"/>
                 <result column="freeze_qty" property="freezeQty"/>
@@ -49,6 +53,9 @@
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
         <result column="box" property="box"/>
         <result column="piece" property="piece"/>
+        <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+        <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+        <result column="pack_box" property="packBox"/>
         <result column="freeze_qty" property="freezeQty"/>
         <result column="unfreeze_qty" property="unfreezeQty"/>
         <result column="surplus_qty" property="surplusQty"/>
@@ -111,6 +118,8 @@
         ,sku.pack_box
         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 sku.unit_id = ul.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS u2 ON sku.sub_unit_id = u2.unit_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
         LEFT JOIN dkic_b.t_mst_goods_brand AS brand ON brand.brand_id=sku.brand_id

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

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, transfer_id, transfer_date, item_index, box, piece, sku_id, o_inv_id, inv_id, o_wh_id, transfer_qty, wh_id, o_non_std_code, non_std_code, price_into, intoing_amt, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, transfer_id, transfer_date, item_index,sub_unit_id, unit_id,pack_box,box, piece, sku_id, o_inv_id, inv_id, o_wh_id, transfer_qty, wh_id, o_non_std_code, non_std_code, price_into, intoing_amt, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 一览查询列 -->
@@ -13,7 +13,8 @@
         item.item_id, item.transfer_id, item.transfer_date,item.box,item.piece, item.item_index, item.sku_id, item.o_inv_id, item.inv_id
         , item.o_wh_id, item.transfer_qty, item.wh_id, item.o_non_std_code, item.non_std_code, item.price_into, item.intoing_amt
         ,inv.non_std_code,oinv.non_std_code AS "oNonStdCode",wh.wh_Name AS "whName",owh.wh_Name AS "oWhName",item.flg_valid
-        ,sku.sku_code,sku.sku_name,sku.sku_model,brand.short_name
+        ,sku.sku_code,sku.sku_name,sku.sku_model,brand.short_name,item.sub_unit_id,item.unit_id,item.pack_box
+        ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,item.box,item.piece) AS "boxPiece"
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -27,6 +28,9 @@
                 <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
                 <result column="o_wh_id" property="oWhId" typeHandler="UuidTypeHandler"/>
                 <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
+                <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+                <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+                <result column="pack_box" property="packBox"/>
                 <result column="box" property="box"/>
                 <result column="piece" property="piece"/>
                 <result column="o_non_std_code" property="oNonStdCode"/>
@@ -56,6 +60,9 @@
         <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
         <result column="o_wh_id" property="oWhId" typeHandler="UuidTypeHandler"/>
         <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
+        <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+        <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+        <result column="pack_box" property="packBox"/>
         <result column="box" property="box"/>
         <result column="piece" property="piece"/>
         <result column="o_non_std_code" property="oNonStdCode"/>
@@ -157,6 +164,8 @@
         <include refid="Base_Column_List_Response"/>
         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 sku.unit_id = ul.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS u2 ON sku.sub_unit_id = u2.unit_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
         LEFT JOIN dkic_b.t_psi_inventory AS oinv ON oinv.inv_id=item.o_inv_id

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

@@ -74,7 +74,8 @@
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="inventoryCount" property="inventoryCount"/>
-
+        <result column="subUnitName" property="subUnitName"/>
+        <result column="unitName" property="unitName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -167,8 +168,12 @@
         <include refid="Base_Column_List_JOIN"/>
         ,tmgb.short_name AS "shortName"
         ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName"
+        ,tmgus.unit_name         as "subUnitName"
+        ,tmgu.unit_name         as "unitName"
         ,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
+        left join dkic_b.t_mst_unit as tmgus on tmgs.sub_unit_id = tmgus.unit_id
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
         LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
         <include refid="Condition"/>

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

@@ -43,6 +43,9 @@
         tppi.from_item_id
         ,tppi.box
         ,tppi.piece
+        ,tppi.unit_id
+        ,tppi.sub_unit_id
+        ,tppi.pack_box
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -113,8 +116,11 @@
         <result column="box" property="box"/>
         <result column="piece" property="piece"/>
         <result column="pack_box" property="packBox"/>
-        <result column="unitId" property="unitId"/>
-        <result column="subUnitId" property="subUnitId"/>
+        <result column="unit_id" property="unitId"/>
+        <result column="sub_unit_id" property="subUnitId"/>
+        <result column="subUnitName" property="subUnitName"/>
+        <result column="unitName" property="unitName"/>
+        <result column="flg_sub_unit" property="flgSubUnit"/>
         <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="specsName" property="specsName"/>
     </resultMap>
@@ -319,12 +325,14 @@
         ,tmgs.price_purchase  as "pricePurchase"
         ,tmgs.price_standard  as "priceStandard"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
-        ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tppi.box,tppi.piece) as "specsName"
+        ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tppi.box,tppi.piece) as "specsName"
         ,i.inv_id
         ,i.inv_qty
         ,i.usable_qty
         ,tpp.pur_no as "purNo"
-        ,tmgs.pack_box
+        ,tmgus.unit_name        as "subUnitName"
+        ,tmgu.unit_name         as "unitName"
+        ,tmgs.flg_sub_unit
         FROM dkic_b.t_psi_purchase_item tppi
         left join(SELECT T.*
         FROM (select tpi.inv_id,
@@ -345,8 +353,8 @@
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         left join sys.t_data_kind tdk1 on tdk1.kind_code = tppi.into_status
         left join dkic_b.t_psi_purchase tpp  on tpp.pur_id = tppi.pur_id
-        left join dkic_b.t_mst_unit ul on tppi.unit_id = ul.unit_id
-        left join dkic_b.t_mst_unit u2 on tppi.sub_unit_id = u2.unit_id
+        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
 
         <include refid="Condition_1"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

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

@@ -79,6 +79,24 @@ public class CheckItem extends PageInfo<CheckItem> implements Serializable {
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
 
     /**
      * 库存ID

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

@@ -80,6 +80,24 @@ public class FreezeItem extends PageInfo<FreezeItem> implements Serializable {
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 冻结数量
      */

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

@@ -64,6 +64,24 @@ public class TransferItem extends PageInfo<TransferItem> implements Serializable
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 调整日期
      */

src/main/java/com/dk/mdm/model/query/ivt/CheckItemQuery.java

@@ -79,6 +79,24 @@ public class CheckItemQuery extends PageInfo<CheckItemQuery> implements Serializ
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 库存ID
      */

src/main/java/com/dk/mdm/model/query/ivt/FreezeItemQuery.java

@@ -78,6 +78,24 @@ public class FreezeItemQuery extends PageInfo<FreezeItemQuery> implements Serial
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 冻结数量
      */

src/main/java/com/dk/mdm/model/query/ivt/TransferItemQuery.java

@@ -88,6 +88,24 @@ public class TransferItemQuery extends PageInfo<TransferItemQuery> implements Se
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 源库存ID
      */

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

@@ -88,6 +88,31 @@ public class CheckItemResponse extends PageInfo<CheckItemResponse> implements Se
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
+    /**
+     * 包装数量
+     */
+    @Excel(name = "包装数量")
+    @ApiModelProperty(value = "包装数量")
+    private String boxPiece;
+
     /**
      * 库存ID
      */

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

@@ -102,6 +102,27 @@ public class FreezeItemResponse extends PageInfo<FreezeItemResponse> implements
     private  Integer packBox;
 
     /**
+     * 包装数量
+     */
+    @Excel(name = "包装数量")
+    @ApiModelProperty(value = "包装数量")
+    private String boxPiece;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
+    /**
      * 冻结数量
      */
     @Excel(name = "冻结数量")

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

@@ -90,6 +90,31 @@ public class TransferItemResponse extends PageInfo<TransferItemResponse> impleme
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 包装数量
+     */
+    @Excel(name = "包装数量")
+    @ApiModelProperty(value = "包装数量")
+    private String boxPiece;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 源库存ID
      */

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

@@ -65,6 +65,22 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @Excel(name = "包装")
     @ApiModelProperty(value = "包装")
     private Integer packBox;
+
+    @Excel(name = "基本单位名称")
+    @ApiModelProperty(value = "基本单位名称")
+    private String unitName;
+
+    @Excel(name = "包装单位名称")
+    @ApiModelProperty(value = "包装单位名称")
+    private String subUnitName;
+    /**
+     * 辅助单位标识
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "辅助单位标识")
+    private Boolean flgSubUnit;
+
+
     /**
      * 采购订单号
      */

src/main/java/com/dk/mdm/model/vo/ivt/CheckItemVO.java

@@ -86,6 +86,24 @@ public class CheckItemVO extends PageInfo<CheckItemVO> implements Serializable {
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 库存ID
      */

src/main/java/com/dk/mdm/model/vo/ivt/FreezeItemVO.java

@@ -78,6 +78,24 @@ public class FreezeItemVO extends PageInfo<FreezeItemVO> implements Serializable
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 冻结数量
      */

src/main/java/com/dk/mdm/model/vo/ivt/TransferItemVO.java

@@ -89,6 +89,24 @@ public class TransferItemVO extends PageInfo<TransferItemVO> implements Serializ
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
+
+    /**
+     * 基本单位
+     */
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    /**
+     * 包装单位
+     */
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     /**
      * 源库存ID
      */