ソースを参照

반품발주현황 수거서장소 locaiton 포함

dwkim 2 年 前
コミット
08a2f0fabb
共有1 個のファイルを変更した2 個の追加1 個の削除を含む
  1. 2 1
      src/main/resources/mybatis/sqlmaps/rtnmng/RtnOrd.xml

+ 2 - 1
src/main/resources/mybatis/sqlmaps/rtnmng/RtnOrd.xml

@@ -108,7 +108,8 @@
108 108
 
109 109
     <select id="selectRtnOdrGridList" resultType="com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity">
110 110
         select base.brand_id, fn_brand_nm(base.brand_id) as brand_nm, base.rtn_podr_unq_no, base.rtn_odr_st_cd, fn_code_nm('RTN_ODR_ST_CD',base.rtn_odr_st_cd) as rtn_odr_st_nm
111
-            , date_format(base.rtn_odr_reg_dt,'%Y.%m.%d') as rtn_odr_reg_dt, base.rtn_whs_id, fn_whs_nm(base.brand_id,base.rtn_whs_id) as rtn_whs_nm, base.spply_id
111
+            , date_format(base.rtn_odr_reg_dt,'%Y.%m.%d') as rtn_odr_reg_dt, base.rtn_whs_id
112
+            , concat(fn_whs_nm(base.brand_id,base.rtn_whs_id),' - ', fn_whs_location_nm(base.brand_id,base.rtn_whs_id, base.rtn_location)) as rtn_whs_nm, base.spply_id
112 113
             , fn_spply_nm(base.spply_id) as spply_nm, base.rtn_dodr_total_amt, base.rtn_dodr_item_qty, date_format(base.col_req_dt,'%Y.%m.%d') as col_req_dt
113 114
             , base.col_dvsn,  fn_code_nm('COL_DVSN', base.col_dvsn) as col_dvsn_nm, base.whs_id, fn_whs_nm(base.brand_id,base.whs_id) as whs_nm
114 115
         from   rtn_odr_base_info base