dongke hai 1 ano
pai
achega
7744856ab3

+ 10 - 1
src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -540,7 +540,6 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
-                 left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
@@ -582,9 +581,19 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
             t.non_std_code,
                t.remarks
                 ,tmgu.decimal_places    as "decimalPlaces"
+                ,tmgus.unit_name         as "subUnitName"
+                ,tmgu.unit_name         as "unitName"
+                ,t.pack_box
+                ,tmgs.flg_sub_unit       as "flgSubUnit"
+                ,t.outing_box
+                ,t.outing_piece
+                ,t.out_box
+                ,t.out_piece
+        ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
+                 left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id

+ 2 - 2
src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -1120,8 +1120,8 @@
         tmgs.sku_images AS list_sku_images,
                       tpity.wh_id AS list_wh_id,
                       tmw.wh_name AS list_wh_name
-               ,sys.f_remove_zero(tpi.inv_qty)     as "invQty"
-               ,sys.f_remove_zero(tpi.usable_qty)    as "usableQty"
+               ,sys.f_remove_zero(tpi.inv_qty)     as "list_invQty"
+               ,sys.f_remove_zero(tpi.usable_qty)    as "list_usableQty"
                ,tmgus.unit_name         as "list_subUnitName"
                 ,tmgu.unit_name         as "list_unitName"
                 ,tpoi.pack_box  as "list_pack_box"