添加箱片

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

@@ -1039,6 +1039,7 @@
                tpi.wh_id              as "whId",
                tmw.wh_code            as "whCode",
                tmw.wh_name            as "whName",
+               tmgs.pack_box          as "packBox",
                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, 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, 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.inv_qty,item.o_inv_qty,item.box,item.piece
         ,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
@@ -30,6 +30,8 @@
                 <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
                 <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
                 <result column="inv_qty" property="invQty"/>
+                <result column="box" property="box"/>
+                <result column="piece" property="piece"/>
                 <result column="check_qty" property="checkQty"/>
                 <result column="balance_qty" property="balanceQty"/>
                 <result column="price_into" property="priceInto"/>
@@ -58,6 +60,8 @@
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
         <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
         <result column="inv_qty" property="invQty"/>
+        <result column="box" property="box"/>
+        <result column="piece" property="piece"/>
         <result column="check_qty" property="checkQty"/>
         <result column="balance_qty" property="balanceQty"/>
         <result column="price_into" property="priceInto"/>

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

@@ -5,11 +5,11 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, freeze_id, item_index, sku_id, 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, 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.freeze_qty, item.unfreeze_qty, item.surplus_qty, item.remarks, item.inv_id, item.flg_valid
+        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
     </sql>
 
@@ -19,6 +19,8 @@
                 <result column="freeze_id" property="freezeId" typeHandler="UuidTypeHandler"/>
                 <result column="item_index" property="itemIndex"/>
                 <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+                <result column="box" property="box"/>
+                <result column="piece" property="piece"/>
                 <result column="freeze_qty" property="freezeQty"/>
                 <result column="unfreeze_qty" property="unfreezeQty"/>
                 <result column="surplus_qty" property="surplusQty"/>
@@ -36,6 +38,7 @@
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="sku_spec" property="skuSpec"/>
         <result column="non_std_code" property="nonStdCode"/>
+        <result column="pack_box" property="packBox"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -44,6 +47,8 @@
         <result column="freeze_id" property="freezeId" typeHandler="UuidTypeHandler"/>
         <result column="item_index" property="itemIndex"/>
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+        <result column="box" property="box"/>
+        <result column="piece" property="piece"/>
         <result column="freeze_qty" property="freezeQty"/>
         <result column="unfreeze_qty" property="unfreezeQty"/>
         <result column="surplus_qty" property="surplusQty"/>
@@ -103,6 +108,7 @@
         ,sku.sku_images
         ,sku.sku_spec
         ,inv.non_std_code
+        ,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_psi_inventory AS inv ON inv.inv_id=item.inv_id

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

@@ -5,12 +5,12 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, transfer_id, transfer_date, item_index, 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, 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>
 
     <!-- 一览查询列 -->
     <sql id="Base_Column_List_Response">
-        item.item_id, item.transfer_id, item.transfer_date, item.item_index, item.sku_id, item.o_inv_id, item.inv_id
+        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
@@ -27,6 +27,8 @@
                 <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="box" property="box"/>
+                <result column="piece" property="piece"/>
                 <result column="o_non_std_code" property="oNonStdCode"/>
                 <result column="non_std_code" property="nonStdCode"/>
                 <result column="price_into" property="priceInto"/>
@@ -54,6 +56,8 @@
         <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="box" property="box"/>
+        <result column="piece" property="piece"/>
         <result column="o_non_std_code" property="oNonStdCode"/>
         <result column="non_std_code" property="nonStdCode"/>
         <result column="price_into" property="priceInto"/>

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

@@ -71,6 +71,14 @@ public class CheckItem extends PageInfo<CheckItem> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
+
 
     /**
      * 库存ID

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

@@ -72,6 +72,13 @@ public class FreezeItem extends PageInfo<FreezeItem> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 冻结数量

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

@@ -56,6 +56,13 @@ public class TransferItem extends PageInfo<TransferItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String transferId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 调整日期

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

@@ -71,6 +71,13 @@ public class CheckItemQuery extends PageInfo<CheckItemQuery> implements Serializ
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 库存ID

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

@@ -70,6 +70,13 @@ public class FreezeItemQuery extends PageInfo<FreezeItemQuery> implements Serial
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 冻结数量

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

@@ -80,6 +80,13 @@ public class TransferItemQuery extends PageInfo<TransferItemQuery> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 源库存ID

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

@@ -80,6 +80,13 @@ public class CheckItemResponse extends PageInfo<CheckItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 库存ID

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

@@ -89,6 +89,17 @@ public class FreezeItemResponse extends PageInfo<FreezeItemResponse> implements
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
+
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private  Integer packBox;
 
     /**
      * 冻结数量

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

@@ -82,6 +82,13 @@ public class TransferItemResponse extends PageInfo<TransferItemResponse> impleme
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 源库存ID

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

@@ -78,6 +78,13 @@ public class CheckItemVO extends PageInfo<CheckItemVO> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 库存ID

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

@@ -70,6 +70,13 @@ public class FreezeItemVO extends PageInfo<FreezeItemVO> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 冻结数量

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

@@ -81,6 +81,13 @@ public class TransferItemVO extends PageInfo<TransferItemVO> implements Serializ
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
 
     /**
      * 源库存ID