出入库明细添加箱片

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

@@ -9,7 +9,7 @@
         into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt,
         remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, 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,
-        s_into_id,s_into_item_id,s_pur_id,s_pur_item_id
+        s_into_id,s_into_item_id,s_pur_id,s_pur_item_id,intoing_box,intoing_piece,into_box,into_piece
     </sql>
 
     <!-- response通用查询列 -->
@@ -17,7 +17,8 @@
         tpii.item_id, tpii.into_id, tpii.into_type, tpii.from_id, tpii.from_item_id, tpii.item_index, tpii.sku_id, tpii.price_into,
         tpii.non_std_code, tpii.into_status, tpii.intoing_qty, tpii.intoing_amt, tpii.into_qty, tpii.into_amt, tpii.return_qty,
         tpii.return_amt, tpii.remarks, tpii.inv_id, tpii.cost_price, tpii.cost_amt, tpii.out_qty, tpii.inv_qty, tpii.flg_valid,
-        tpii.cp_id,tpii.s_into_id,tpii.s_into_item_id,tpii.s_pur_id,tpii.s_pur_item_id
+        tpii.cp_id,tpii.s_into_id,tpii.s_into_item_id,tpii.s_pur_id,tpii.s_pur_item_id,
+        tppi.intoing_box,tppi.intoing_piece,tppi.into_box,tppi.into_piece
     </sql>
 
 
@@ -58,6 +59,10 @@
         <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
+        <result column="intoing_box" property="intoingBox" />
+        <result column="intoing_piece" property="intoingPiece" />
+        <result column="into_box" property="intoBox" />
+        <result column="into_piece" property="intoPiece" />
     </resultMap>
 
 
@@ -94,6 +99,10 @@
         <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
+        <result column="intoing_box" property="intoingBox" />
+        <result column="intoing_piece" property="intoingPiece" />
+        <result column="into_box" property="intoBox" />
+        <result column="into_piece" property="intoPiece" />
     </resultMap>
 <!--    退货用-->
     <resultMap id="BaseResultMapReturnResponse" type="com.dk.mdm.model.response.ivt.InboundItemResponse">
@@ -142,6 +151,10 @@
         <result column="sPurItemReturnAmt" property="sPurItemReturnAmt"/>
         <result column="usableQty" property="usableQty"/>
         <result column="nonStdCode" property="nonStdCode"/>
+        <result column="intoing_box" property="intoingBox" />
+        <result column="intoing_piece" property="intoingPiece" />
+        <result column="into_box" property="intoBox" />
+        <result column="into_piece" property="intoPiece" />
 
     </resultMap>
 
@@ -368,7 +381,11 @@
         tpii.cost_price,
         tpii.cost_amt,
         tpii.wh_id,
-        tpii.inv_qty
+        tpii.inv_qty,
+        tpii.intoing_box,
+        tpii.intoing_piece,
+        tpii.into_box,
+        tpii.into_piece
     </sql>
     <sql id="Base_Column_List_Response_Out">
         tpoi.item_id,
@@ -392,7 +409,11 @@
         tpoi.cost_price,
         tpoi.cost_amt,
         null as  wh_id,
-        null  as inv_qty
+        null  as inv_qty,
+        tpoi.outing_box as intoing_box,
+        tpoi.outing_piece as intoing_piece,
+        tpoi.out_box as into_box,
+        tpoi.out_piece as into_piece
     </sql>
     <!--条件查询 web端入库办理用-->
     <select id="selectInboundItem" resultMap="BaseResultMapResponse">

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

@@ -10,7 +10,7 @@
         out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks,
         inv_id, cost_price, cost_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,
-        s_out_id,s_out_item_id,s_order_id,s_order_item_id
+        s_out_id,s_out_item_id,s_order_id,s_order_item_id,outing_box,outing_piece,out_box,out_piece
     </sql>
 
     <sql id="Base_Column_List_Response">
@@ -21,8 +21,8 @@
         tpoi.sku_id, tpoi.price_out, tpoi.non_std_code, tpoi.out_status, tpoi.outing_qty, tpoi.outing_amt,
         tpoi.out_qty, tpoi.out_amt, tpoi.return_qty, tpoi.return_amt, tpoi.remarks, tpoi.inv_id,
         tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id,
-        tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id
-
+        tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id,
+        tpoi.outing_box,tpoi.outing_piece,tpoi.out_box,tpoi.out_piece
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -60,6 +60,10 @@
         <result column="s_out_item_id" property="sOutItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_order_id" property="sOrderId" typeHandler="UuidTypeHandler"/>
         <result column="s_order_item_id" property="sOrderItemId" typeHandler="UuidTypeHandler"/>
+        <result column="outing_box" property="outingBox"/>
+        <result column="outing_piece" property="outingPiece"/>
+        <result column="out_box" property="outBox"/>
+        <result column="out_piece" property="outPiece"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -105,6 +109,10 @@
         <result column="invQty" property="invQty"/>
         <result column="usableQty" property="usableQty"/>
         <result column="whName" property="whName"/>
+        <result column="outing_box" property="outingBox"/>
+        <result column="outing_piece" property="outingPiece"/>
+        <result column="out_box" property="outBox"/>
+        <result column="out_piece" property="outPiece"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -514,7 +522,11 @@
         tpoi.remarks,
         tpoi.inv_id,
         tpoi.cost_price,
-        tpoi.cost_amt
+        tpoi.cost_amt,
+        tpoi.outing_box,
+        tpoi.outing_piece,
+        tpoi.out_box,
+        tpoi.out_piece
     </sql>
     <sql id="Base_Column_List_Response_Into">
         tpii.item_id ,
@@ -536,7 +548,11 @@
         tpii.remarks,
         tpii.inv_id,
         tpii.cost_price,
-        tpii.cost_amt
+        tpii.cost_amt,
+        tpii.intoing_box as outing_box,
+        tpii.intoing_piece as outing_piece,
+        tpii.into_box as out_box,
+        tpii.into_piece as out_piece
     </sql>
     <!--条件查询 web端出库办理用-->
     <select id="selectOutboundItem" resultMap="BaseResultMapResponse">

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

@@ -328,6 +328,23 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     @ApiModelProperty(value = "入库仓库")
     private String whId;
 
+    @Excel(name = "箱（入库中）")
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @Excel(name = "片（入库中）")
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @Excel(name = "箱（已入库")
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @Excel(name = "片（已入库")
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
+
 
     private static final long serialVersionUID = 1L;
 

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

@@ -305,6 +305,21 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderItemId;
 
+    @Excel(name = "箱（出库中）")
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @Excel(name = "片（出库中）")
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @Excel(name = "箱（已出库）")
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @Excel(name = "片（已出库）")
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
 
 
     private static final long serialVersionUID = 1L;

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

@@ -262,6 +262,23 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    @Excel(name = "箱（入库中）")
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @Excel(name = "片（入库中）")
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @Excel(name = "箱（已入库")
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @Excel(name = "片（已入库")
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
+
 
     /**
      * 企业ID

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

@@ -204,6 +204,24 @@ public class OutboundItemResponse {
     private Boolean flgValid;
 
 
+    @Excel(name = "箱（出库中）")
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @Excel(name = "片（出库中）")
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @Excel(name = "箱（已出库）")
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @Excel(name = "片（已出库）")
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
+
+
+
     /**
      * 企业ID
      */

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

@@ -218,6 +218,19 @@ public class InboundItemVO  {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sPurItemId;
 
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
+
 
     /*
      * 相关属性

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

@@ -190,6 +190,20 @@ public class OutboundItemVO {
     private Boolean flgValid;
 
 
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
+
+
+
     /**
      * 企业ID
      */