수정처리

src/main/resources/mybatis/sqlmaps/stinfo/ItemUnit.xml

@@ -576,12 +576,12 @@
                 , stck.PRP_STCK_QTY /* 안전재고 기준수량 */
                 , stck.SFT_STCK_RT /* 안전재고율 */
                 ,'S' as unit_gubun
-                , whs.whs_nm
+                 , concat( whs.whs_nm , case when loc.location is null  then '' else  concat('-',loc.LOCATION_NM) end) as whs_nm
         FROM store_base_info store
         INNER JOIN whs_mgnt_base_info whs
-            ON store.STORE_ID = whs.STORE_ID AND store.BRAND_ID = whs.BRAND_ID
+            ON store.STORE_ID = whs.STORE_ID AND store.BRAND_ID = whs.BRAND_ID and whs.WHS_ID = #{sWhsId} and whs.WHS_DVSN = 'W02'
         INNER JOIN whs_mgnt_base_loc loc
-            ON whs.whs_id = loc.whs_id and whs.WHS_ID = #{sWhsId} and whs.WHS_DVSN = 'W02'
+            ON whs.whs_id = loc.whs_id and whs.brand_id = loc.brand_id
         INNER JOIN stck_mgnt_base_info stck
             ON store.BRAND_ID = stck.BRAND_ID AND whs.WHS_ID = stck.WHS_ID and loc.location = stck.location
         INNER JOIN store_item_unit_info sitem
@@ -651,12 +651,12 @@
         , stck.SFT_STCK_RT /* 안전재고율 */
         , whs.WHS_ID
         ,'B' as unit_gubun
-        , whs.whs_nm
+        , concat( whs.whs_nm , case when loc.location is null  then '' else  concat('-',loc.LOCATION_NM) end) as whs_nm
         FROM brand_base_info brand
         INNER JOIN whs_mgnt_base_info whs
-            ON brand.BRAND_ID = whs.BRAND_ID
+            ON brand.BRAND_ID = whs.BRAND_ID and whs.WHS_ID = #{sWhsId} and whs.WHS_DVSN = 'W01'
         INNER JOIN whs_mgnt_base_loc loc
-            ON whs.whs_id = loc.whs_id and whs.WHS_ID = #{sWhsId} and whs.WHS_DVSN = 'W01'
+            ON whs.whs_id = loc.whs_id and whs.brand_id = loc.brand_id
         INNER JOIN stck_mgnt_base_info stck
             ON brand.BRAND_ID = stck.BRAND_ID AND whs.WHS_ID = stck.WHS_ID and loc.location = stck.location
         INNER JOIN brand_item_unit_info bitem