供应商

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

@@ -384,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/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 = "包装单位编码")