dongke 1 год назад
Родитель
Сommit
59f9c6cd0b

+ 2 - 0
src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -103,6 +103,7 @@
         <result column="intoing_piece" property="intoingPiece" />
         <result column="into_box" property="intoBox" />
         <result column="into_piece" property="intoPiece" />
+        <result column="pack_box" property="packBox"/>
     </resultMap>
 <!--    退货用-->
     <resultMap id="BaseResultMapReturnResponse" type="com.dk.mdm.model.response.ivt.InboundItemResponse">
@@ -223,6 +224,7 @@
         ,tppi.intoing_qty as "purItemIntoingQty"
         ,tppi.into_qty as "purItemIntoQty"
         ,tpiv.inv_qty
+        ,tmgs.pack_box
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_psi_inventory tpiv on tpiv.inv_id = tpii.inv_id
         left join dkic_b.t_psi_purchase_item tppi on tppi.item_id = tpii.from_item_id

+ 2 - 1
src/main/java/com/dk/mdm/mapper/pur/PurchaseItemMapper.xml

@@ -112,6 +112,7 @@
         <result column="usable_qty" property="usableQty"/>
         <result column="box" property="box"/>
         <result column="piece" property="piece"/>
+        <result column="pack_box" property="packBox"/>
         <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
     </resultMap>
 
@@ -320,7 +321,7 @@
         i.inv_qty,
         i.usable_qty
         ,tpp.pur_no as "purNo"
-
+        ,tmgs.pack_box
         FROM dkic_b.t_psi_purchase_item tppi
         left join(SELECT T.*
         FROM (select tpi.inv_id,

+ 6 - 1
src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -26,7 +26,12 @@ public class InboundItemResponse  {
     /*
      * 数据库字段
      */
-
+    /**
+     * 包装
+     */
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
     /**
      * 明细ID
      */

+ 3 - 0
src/main/java/com/dk/mdm/model/response/pur/PurchaseItemResponse.java

@@ -45,6 +45,9 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @Excel(name = "片")
     @ApiModelProperty(value = "片")
     private  Integer piece;
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
     /**
      * 明细ID
      */