Browse Source

问题修改

changhaoning 1 năm trước cách đây
mục cha
commit
dd8a5123b8

+ 2 - 0
src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -558,6 +558,7 @@
         tmgu.unit_name         as "unitName",
         tmgu.decimal_places    as "decimalPlaces",
         tmgs.sub_unit_id       as "subUnitId",
+        tmgus.unit_name        as "subUnitName",
         tmgs.conversion_factor as "conversionFactor",
         tmgs.series_id         as "seriesId",
         tmgseries.series_name  as "seriesName",
@@ -574,6 +575,7 @@
         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 tmgus on tmgs.sub_unit_id = tmgus.unit_id
         where tmgs.flg_valid
         AND tmgs.cp_id = #{cpId}
         <if test="skuCode != null">

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

@@ -568,7 +568,7 @@
         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 dkic_b.t_psi_order_item.unit_id = ul.unit_id) as "decimalPlaces"
+        ,(select ul.decimal_places from  dkic_b.t_mst_unit ul where t.unit_id = ul.unit_id) as "decimalPlaces"
         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