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

@@ -1049,7 +1049,6 @@
                tmgs.category_id       as "categoryId",
                tmgc.cat_name          as "categoryName",
                tmgs.unit_id           as "unitId",
-               tmgu.unit_name         as "unitName",
                tmgs.sub_unit_id       as "subUnitId",
                tmgs.conversion_factor as "conversionFactor",
                tmgs.series_id         as "seriesId",
@@ -1071,6 +1070,8 @@
                tmgs.pack_box          as "packBox",
                tmgs.unit_id           as "unitId",
                tmgs.sub_unit_id       as "subUnitId",
+               ul.unit_name           as "unitName",
+               u2.unit_name           as "subUnitName",
                dkic_b.f_get_last_ivt_price(tpi.inv_id,null,null,null) as "priceInto",
                tpi.remarks
         from dkic_b.t_psi_inventory as tpi
@@ -1079,7 +1080,8 @@
                  left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id
                  left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id
                  left join dkic_b.t_mst_goods_series as tmgseries on tmgs.series_id = tmgseries.series_id
-                 left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
+                 left join dkic_b.t_mst_unit as ul on tmgs.unit_id = ul.unit_id
+                 left join dkic_b.t_mst_unit as u2 on tmgs.sub_unit_id = u2.unit_id
         where tpi.flg_valid
           AND tpi.cp_id = #{cpId}
         <if test="skuId != null">

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

@@ -602,10 +602,20 @@
         t.return_amt,
         t.remarks,
         t.item_qty - coalesce(sumQty,0) as "transferableQuantity"
-        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where t.unit_id = ul.unit_id) as "decimalPlaces"
+        ,ul.decimal_places as "decimalPlaces"
+        ,t.box
+        ,t.piece
+        ,t.pack_box
+        ,t.unit_id
+        ,t.sub_unit_id
+        ,ul.unit_name         as "unitName"
+        ,u2.unit_name         as "subUnitName"
+        ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,t.box,t.piece) as "boxPiece"
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
+        left join dkic_b.t_mst_unit ul on t.unit_id = ul.unit_id
+        left join dkic_b.t_mst_unit u2 on t.sub_unit_id = u2.unit_id
         left join(select from_item_id,sum(item_qty) as sumQty from dkic_b.t_psi_purchase_item
             group by from_item_id) as pi on pi.from_item_id = t.item_id
         <where>