采购订单 箱片修改

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

@@ -552,6 +552,7 @@
         tmgs.price_wholesale   as "priceWholesale",
         tmgs.price_limited     as "priceLimited",
         tmgs.sku_images        as "skuImages",
+        tmgs.pack_box          as "packBox",
         tmgs.remarks
         from dkic_b.t_mst_goods_sku as tmgs
         left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id

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

@@ -113,7 +113,10 @@
         <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="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
+        <result column="specsName" property="specsName"/>
     </resultMap>
 
 
@@ -316,10 +319,10 @@
         ,tmgs.price_purchase  as "pricePurchase"
         ,tmgs.price_standard  as "priceStandard"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
-        ,
-        i.inv_id,
-        i.inv_qty,
-        i.usable_qty
+        ,dkic_b.f_box_piece(u2.unit_name,ul.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
         FROM dkic_b.t_psi_purchase_item tppi
@@ -342,7 +345,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
 
         <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/pur/PurchaseItem.java

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

src/main/java/com/dk/mdm/model/query/pur/PurchaseItemQuery.java

@@ -272,6 +272,26 @@ public class PurchaseItemQuery extends PageInfo<PurchaseItemQuery> implements Se
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  Integer piece;
+
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
+
 
     /*
      * 相关属性

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

@@ -38,6 +38,14 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     /*
      * 数据库字段
      */
+    /**
+     * 明细ID
+     */
+    @TableId(value = "item_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String itemId;
+
     @Excel(name = "箱")
     @ApiModelProperty(value = "箱")
     private  Integer box;
@@ -45,17 +53,19 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @Excel(name = "片")
     @ApiModelProperty(value = "片")
     private  Integer piece;
+
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
     @Excel(name = "包装")
     @ApiModelProperty(value = "包装")
     private Integer packBox;
     /**
-     * 明细ID
-     */
-    @TableId(value = "item_id", type = IdType.AUTO)
-    @ApiModelProperty(value = "明细ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String itemId;
-    /**
      * 采购订单号
      */
     @Excel(name = "采购订单号")
@@ -392,6 +402,9 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @TableField(typeHandler = JsonTypeHandler.class)
     private JSONArray skuImages;
 
+    //箱片规格
+    private String specsName;
+
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/vo/pur/PurchaseItemVO.java

@@ -63,6 +63,18 @@ public class PurchaseItemVO extends PageInfo<PurchaseItemVO> implements Serializ
     @ApiModelProperty(value = "片")
     private  Integer piece;
 
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
+
 
     /**
      * 来源单ID (采购订单、出库退货)