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

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/ivt/InboundItemMapper.xml

@@ -108,6 +108,9 @@
         <result column="unit_id" property="unitId"/>
         <result column="sub_unit_id" property="subUnitId"/>
         <result column="pack_box" property="packBox"/>
+        <result column="subUnitName" property="subUnitName"/>
+        <result column="unitName" property="unitName"/>
+        <result column="flg_sub_unit" property="flgSubUnit"/>
     </resultMap>
 <!--    退货用-->
     <resultMap id="BaseResultMapReturnResponse" type="com.dk.mdm.model.response.ivt.InboundItemResponse">
@@ -235,7 +238,12 @@
         ,tppi.into_qty as "purItemIntoQty"
         ,tpiv.inv_qty
         ,tmgs.pack_box
+        ,tmgus.unit_name         as "subUnitName"
+        ,tmgu.unit_name         as "unitName"
+        ,tmgs.flg_sub_unit
         FROM dkic_b.t_psi_inbound_item tpii
+        left join dkic_b.t_mst_unit as tmgu on tpii.unit_id = tmgu.unit_id
+        left join dkic_b.t_mst_unit as tmgus on tpii.sub_unit_id = tmgus.unit_id
         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
         left join dkic_b.t_psi_purchase tpp on tpp.pur_id = tpii.from_id

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

@@ -122,6 +122,7 @@
         <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>
 
 
@@ -324,18 +325,15 @@
         ,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(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"
-        ,tmgus.unit_name         as "subUnitName"
+        ,tmgus.unit_name        as "subUnitName"
         ,tmgu.unit_name         as "unitName"
         ,tmgs.flg_sub_unit
         FROM dkic_b.t_psi_purchase_item tppi
-        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
-
         left join(SELECT T.*
         FROM (select tpi.inv_id,
         tpi.wh_id,
@@ -355,7 +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 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">
@@ -385,7 +384,12 @@
         i.inv_qty,
         i.usable_qty
         ,tpp.pur_no as "purNo"
+        ,tmgus.unit_name         as "subUnitName"
+        ,tmgu.unit_name         as "unitName"
+        ,tmgs.flg_sub_unit
         FROM dkic_b.t_psi_purchase_item tppi
+        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
         left join(SELECT T.*
         FROM (select tpi.inv_id,
         tpi.wh_id,

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

@@ -892,6 +892,14 @@
             ,i.inv_qty AS "invQty"
             ,i.usable_qty AS "usableQty"
         ,tppitem.pur_no as "purNo"
+        ,tppi.unit_id AS "unitId"
+        ,tppi.sub_unit_id AS "subUnitId"
+        ,tppi.pack_box AS "packBox"
+        ,tppi.box AS "box"
+        ,tppi.piece AS "piece"
+        ,tmguitems.unit_name         as "subUnitName"
+        ,tmguitem.unit_name         as "unitName"
+        ,tmgsitem.flg_sub_unit as "flgSubUnit"
         FROM dkic_b.t_psi_purchase_item tppi
         left join(SELECT T.*
         FROM (select tpi.inv_id,
@@ -912,6 +920,8 @@
         left join dkic_b.t_mst_goods_brand tmgbitem on tmgbitem.brand_id = tmgsitem.brand_id
         left join sys.t_data_kind tdk1item on tdk1item.kind_code = tppi.into_status
         left join dkic_b.t_psi_purchase tppitem  on tppitem.pur_id = tppi.pur_id
+        left join dkic_b.t_mst_unit as tmguitem on tppi.unit_id = tmguitem.unit_id
+        left join dkic_b.t_mst_unit as tmguitems on tppi.sub_unit_id = tmguitems.unit_id
         WHERE
         tppi.pur_id = tpp.pur_id
         AND  tppi.into_status != '入库状态-已入库'

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -636,10 +636,21 @@
         tmgs.price_purchase AS "pricePurchase",
         tmgs.price_standard AS "priceStandard",
         tmgs.sku_images AS "skuImages"
+        ,toi.unit_id AS "unitId"
+        ,toi.sub_unit_id AS "subUnitId"
+        ,toi.pack_box AS "packBox"
+        ,toi.box AS "box"
+        ,toi.piece AS "piece"
+        ,tmgus.unit_name         as "subUnitName"
+        ,tmgu.unit_name         as "unitName"
+        ,tmgs.flg_sub_unit as "flgSubUnit"
         FROM
         dkic_b.t_psi_order_item toi
         LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = toi.sku_id
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
+        left join dkic_b.t_mst_unit as tmgu on toi.unit_id = tmgu.unit_id
+        left join dkic_b.t_mst_unit as tmgus on toi.sub_unit_id = tmgus.unit_id
+
         WHERE
         toi.order_id = T.order_id
         ) item

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/ivt/InboundItemResponse.java

@@ -467,6 +467,12 @@ public class InboundItemResponse  {
     @Excel(name = "基本单位名称")
     @ApiModelProperty(value = "基本单位名称")
     private String unitName;
+    /**
+     * 辅助单位标识
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "辅助单位标识")
+    private Boolean flgSubUnit;
 
     @Excel(name = "包装单位编码")
     @ApiModelProperty(value = "包装单位编码")

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,18 +53,19 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @Excel(name = "片")
     @ApiModelProperty(value = "片")
     private  Integer piece;
-    @Excel(name = "包装")
-    @ApiModelProperty(value = "包装")
-    private Integer packBox;
-    @Excel(name = "基本单位")
+
     @ApiModelProperty(value = "基本单位")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String unitId;
 
-    @Excel(name = "包装单位")
     @ApiModelProperty(value = "包装单位")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String subUnitId;
+
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
+
     @Excel(name = "基本单位名称")
     @ApiModelProperty(value = "基本单位名称")
     private String unitName;
@@ -73,13 +82,6 @@ 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 = "采购订单号")
@@ -416,6 +418,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 (采购订单、出库退货)