itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
이주일
2026-05-29 15:46:10 +09:00
parent d55f52b752 3cddf4e038
commit 2ec020ecd4
2 changed files with 99 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java
View File

@@ -29,61 +29,66 @@ public class BODwldItmVO extends AbstractVO {
private String[] selItems; private String[] selItems;
public enum items { public enum items {
item01("export_group_innb", "출고그룹"), exportGroupInnb("export_group_innb", "출고그룹"),
item02("ordr_innb_with_export_group_innb", "주문번호+출고그룹"), ordrInnbWithExportGroupInnb("ordr_innb_with_export_group_innb", "주문번호+출고그룹"),
item03("ordr_innb", "주문번호"), ordrInnb("ordr_innb", "주문번호"),
item04("smrt_shopng_ordrnb", "npay주문번호"), smrtShopngOrdrnb("smrt_shopng_ordrnb", "npay주문번호"),
item05("ordr_rcept_dt", "주문일"), ordrRceptDt("ordr_rcept_dt", "주문일"),
item06("ordrr_nm", "주문자명"), ordrrNm("ordrr_nm", "주문자명"),
item07("mbr_id", "주문자아이디"), mbrId("mbr_id", "주문자아이디"),
item08("ordrr_mbtlnb", "주문자휴대폰"), ordrrMbtlnb("ordrr_mbtlnb", "주문자휴대폰"),
item09("ordrr_email", "주문자이메일"), ordrrEmail("ordrr_email", "주문자이메일"),
item10("order_memo", "사용자메모"), orderMemo("order_memo", "사용자메모"),
item11("lgstc_adm_memo", "물류담당자메모"), lgstcAdmMemo("lgstc_adm_memo", "물류담당자메모"),
item12("inflow_cours_url", "주문경로"), inflowCoursUrl("inflow_cours_url", "주문경로"),
item13("dlivy_dt", "출고일"), dlivyDt("dlivy_dt", "출고일"),
item14("dlvy_mth_nm", "받는방법"), dlvyMthNm("dlvy_mth_nm", "받는방법"),
item15("hdrycpn_nm", "택배사"), hdrycpnNm("hdrycpn_nm", "택배사"),
item16("invcnb", "운송장번호"), invcnb("invcnb", "운송장번호"),
item17("dlvylc_adres_info", "받는정보"), dlvylcAdresInfo("dlvylc_adres_info", "받는정보"),
item18("recpnt_nm", "수령인"), recpntNm("recpnt_nm", "수령인"),
item19("recpnt_mbtlnb", "수령인휴대폰"), recpntMbtlnb("recpnt_mbtlnb", "수령인휴대폰"),
item20("dlvylc_zip", "우편번호"), dlvylcZip("dlvylc_zip", "우편번호"),
item21("dlvylc_rnm_adres", "전체주소(도로명)"), dlvylcRnmAdres("dlvylc_rnm_adres", "전체주소(도로명)"),
item22("dlvy_amt", "배송비"), dlvyAmt("dlvy_amt", "배송비"),
item23("ordr_goods_innb", "상품고유번호"), ordrGoodsInnb("ordr_goods_innb", "상품고유번호"),
item24("npay_goods_ordrnb", "npay상품주문번호"), npayGoodsOrdrnb("npay_goods_ordrnb", "npay상품주문번호"),
item25("goods_nm", "상품명"), goodsNm("goods_nm", "상품명"),
item26("invntry_qy", "현재고"), goodsNmEn("goods_nm_en", "상품명(영문)"),
item27("prchspric", "매입가"), invntryQy("invntry_qy", "현재고"),
item28("cnsmrpric", "정가"), prchspric("prchspric", "매입가"),
item29("dscntpric", "할인가"), cnsmrpric("cnsmrpric", "정가"),
item30("pric_by_ordr_qy", "할인가x수량"), dscntpric("dscntpric", "할인가"),
item31("taxt_trget_at", "과세여부"), pricByOrdrQy("pric_by_ordr_qy", "할인가x수량"),
item32("input_optn", "추가입력옵션"), taxtTrgetAt("taxt_trget_at", "과세여부"),
item33("ordr_qy", "주문수량"), inputOptn("input_optn", "추가입력옵션"),
item34("refnd_qy", "취소수량"), ordrQy("ordr_qy", "주문수량"),
item35("bfr_sndng_qy", "보낸수량"), refndQy("refnd_qy", "취소수량"),
item36("aftr_sndng_qy", "보낼수량"), bfrSndngQy("bfr_sndng_qy", "보낸수량"),
item37("ordr_sttus_nm", "주문상품상태"), aftrSndngQy("aftr_sndng_qy", "보낼수량"),
item38("goods_dscnt_amt", "상품쿠폰할인"), ordrSttusNm("ordr_sttus_nm", "주문상품상태"),
item39("event_dscnt_amt", "이벤트할인"), goodsDscntAmt("goods_dscnt_amt", "상품쿠폰할인"),
item40("mlt_dscnt_amt", "복수구매할인"), eventDscntAmt("event_dscnt_amt", "이벤트할인"),
item41("dlvy_dscnt_amt", "배송비쿠폰"), mltDscntAmt("mlt_dscnt_amt", "복수구매할인"),
item42("mlg_dscnt_amt", "마일리지사용"), dlvyDscntAmt("dlvy_dscnt_amt", "배송비쿠폰"),
item43("spbk_dscnt_amt", "장바구니할인쿠폰"), mlgDscntAmt("mlg_dscnt_amt", "마일리지사용"),
item44("enuri_dscnt_amt", "에누리"), spbkDscntAmt("spbk_dscnt_amt", "장바구니할인쿠폰"),
item45("setle_amt", "결제금액"), enuriDscntAmt("enuri_dscnt_amt", "에누리"),
item46("setle_dt", "결제일"), setleAmt("setle_amt", "결제금액"),
item47("setle_mth_nm", "결제방법"), setleDt("setle_dt", "결제일"),
item48("snggds_accml_mlg_amt", "지급마일리지"), setleMthNm("setle_mth_nm", "결제방법"),
item49("dlvylc_group_nb", "배송그룹번호"), snggdsAccmlMlgAmt("snggds_accml_mlg_amt", "지급마일리지"),
item50("dlvy_amt_setle_mth_nm", "배송비결제방식"), dlvylcGroupNb("dlvylc_group_nb", "배송그룹번호"),
item51("ordr_ty_nm", "주문유형"), dlvyAmtSetleMthNm("dlvy_amt_setle_mth_nm", "배송비결제방식"),
item52("optn_cd_1", "상품코드"), ordrTyNm("ordr_ty_nm", "주문유형"),
item53("dlvy_mssage_cn", "배송메시지"), optnCd_1("optn_cd_1", "상품코드"),
item54("shipping_sttus_nm", "출고상태"), hscode("hscode", "HS Code"),
item55("subsvc_at", "주문구분"); realWt("realWt", "실무게"),
volWt("volWt", "부피무게"),
packageCnt("packageCnt", "포장개수"),
dlvyMssageCn("dlvy_mssage_cn", "배송메시지"),
shippingSttusNm("shipping_sttus_nm", "출고상태"),
subsvcAt("subsvc_at", "주문구분");
private final String key; private final String key;
private final String value; private final String value;

39
src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
View File

@@ -1076,6 +1076,10 @@
WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM) WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM)
ELSE FOI.GOODS_NM ELSE FOI.GOODS_NM
END AS goods_nm END AS goods_nm
, CASE
WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM_EN, ' ', FOI.OPTN_NM)
ELSE FOI.GOODS_NM_EN
END AS goods_nm_en
, FOI.INVNTRY_QY AS invntry_qy , FOI.INVNTRY_QY AS invntry_qy
, 0 AS prchspric , 0 AS prchspric
, FOI.SLEPRIC AS cnsmrpric , FOI.SLEPRIC AS cnsmrpric
@@ -1106,6 +1110,10 @@
, '선불' AS dlvy_amt_setle_mth_nm , '선불' AS dlvy_amt_setle_mth_nm
, FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ordr_ty_nm , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ordr_ty_nm
, FOI.optn_cd_1 , FOI.optn_cd_1
, FOI.hscode
, FOI.real_wt
, FOI.VOL_TW
, FOI.package_cnt
, FOSH.dlvy_mssage_cn , FOSH.dlvy_mssage_cn
, FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS shipping_sttus_nm , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS shipping_sttus_nm
, CASE WHEN FO.SUBSVC_AT = 'Y' , CASE WHEN FO.SUBSVC_AT = 'Y'
@@ -1120,11 +1128,16 @@
, GOI.ORDR_GOODS_INNB , GOI.ORDR_GOODS_INNB
, GOI.ORDR_GOODS_OPTN_INNB , GOI.ORDR_GOODS_OPTN_INNB
, GOI.OPTN_CD_1 , GOI.OPTN_CD_1
, GOI.HSCODE
, GOI.REAL_WT
, GOI.VOL_TW
, GOI.PACKAGE_CNT
, GOI.ORDR_STTUS_CD , GOI.ORDR_STTUS_CD
, LAG(GOI.ORDR_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_INNB , LAG(GOI.ORDR_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_INNB
, LAG(GOI.ORDR_DLVY_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_DLVY_INNB , LAG(GOI.ORDR_DLVY_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_DLVY_INNB
, MAX(FN_GET_GOODS_IMAGE(GOI.SOPMAL_CD, GOI.GOODS_INNB, '03')) AS GOODS_IMG_COURS , MAX(FN_GET_GOODS_IMAGE(GOI.SOPMAL_CD, GOI.GOODS_INNB, '03')) AS GOODS_IMG_COURS
, MAX(GOI.GOODS_NM) AS GOODS_NM , MAX(GOI.GOODS_NM) AS GOODS_NM
, MAX(GOI.GOODS_NM_EN) AS GOODS_NM_EN
, MAX(FN_GET_ORDER_GOODS_OPTN_NAME(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_OPTN_INNB)) AS OPTN_NM , MAX(FN_GET_ORDER_GOODS_OPTN_NAME(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_OPTN_INNB)) AS OPTN_NM
, SUM(GOI.ORDR_QY) AS ORDR_QY , SUM(GOI.ORDR_QY) AS ORDR_QY
, SUM(GOI.SLEPRIC) AS SLEPRIC , SUM(GOI.SLEPRIC) AS SLEPRIC
@@ -1154,6 +1167,10 @@
, GOI.ORDR_GOODS_INNB , GOI.ORDR_GOODS_INNB
, GOI.ORDR_GOODS_OPTN_INNB , GOI.ORDR_GOODS_OPTN_INNB
, GOI.OPTN_CD_1 , GOI.OPTN_CD_1
, GOI.HSCODE
, GOI.REAL_WT
, GOI.VOL_TW
, GOI.PACKAGE_CNT
, GOI.ORDR_STTUS_CD , GOI.ORDR_STTUS_CD
) FOI ) FOI
ON FOI.SOPMAL_CD = FO.SOPMAL_CD ON FOI.SOPMAL_CD = FO.SOPMAL_CD
@@ -1220,6 +1237,7 @@
, GROUP_CONCAT(A.ORDR_GOODS_INNB ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS ORDR_GOODS_INNB , GROUP_CONCAT(A.ORDR_GOODS_INNB ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS ORDR_GOODS_INNB
, GROUP_CONCAT(A.NPAY_GOODS_ORDRNB ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS NPAY_GOODS_ORDRNB , GROUP_CONCAT(A.NPAY_GOODS_ORDRNB ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS NPAY_GOODS_ORDRNB
, GROUP_CONCAT(A.GOODS_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS GOODS_NM , GROUP_CONCAT(A.GOODS_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS GOODS_NM
, GROUP_CONCAT(A.GOODS_NM_EN ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS GOODS_NM_EN
, GROUP_CONCAT(A.INVNTRY_QY ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS INVNTRY_QY , GROUP_CONCAT(A.INVNTRY_QY ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS INVNTRY_QY
, GROUP_CONCAT(A.PRCHSPRIC ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS PRCHSPRIC , GROUP_CONCAT(A.PRCHSPRIC ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS PRCHSPRIC
, GROUP_CONCAT(A.CNSMRPRIC ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS CNSMRPRIC , GROUP_CONCAT(A.CNSMRPRIC ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS CNSMRPRIC
@@ -1247,6 +1265,10 @@
, GROUP_CONCAT(A.DLVY_AMT_SETLE_MTH_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS DLVY_AMT_SETLE_MTH_NM , GROUP_CONCAT(A.DLVY_AMT_SETLE_MTH_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS DLVY_AMT_SETLE_MTH_NM
, GROUP_CONCAT(A.ORDR_TY_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS ORDR_TY_NM , GROUP_CONCAT(A.ORDR_TY_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS ORDR_TY_NM
, GROUP_CONCAT(A.OPTN_CD_1 ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS OPTN_CD_1 , GROUP_CONCAT(A.OPTN_CD_1 ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS OPTN_CD_1
, GROUP_CONCAT(A.HSCODE ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS HSCODE
, GROUP_CONCAT(A.REAL_WT ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS REAL_WT
, GROUP_CONCAT(A.VOL_TW ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS VOL_TW
, GROUP_CONCAT(A.PACKAGE_CNT ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS PACKAGE_CNT
, GROUP_CONCAT(A.DLVY_MSSAGE_CN ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS DLVY_MSSAGE_CN , GROUP_CONCAT(A.DLVY_MSSAGE_CN ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS DLVY_MSSAGE_CN
, GROUP_CONCAT(A.SHIPPING_STTUS_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SHIPPING_STTUS_NM , GROUP_CONCAT(A.SHIPPING_STTUS_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SHIPPING_STTUS_NM
, GROUP_CONCAT(A.SUBSVC_AT ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SUBSVC_AT , GROUP_CONCAT(A.SUBSVC_AT ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SUBSVC_AT
@@ -1285,6 +1307,10 @@
WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM) WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM)
ELSE FOI.GOODS_NM ELSE FOI.GOODS_NM
END AS GOODS_NM END AS GOODS_NM
, CASE
WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM_EN, ' ', FOI.OPTN_NM)
ELSE FOI.GOODS_NM_EN
END AS GOODS_NM_EN
, FOI.INVNTRY_QY , FOI.INVNTRY_QY
, 0 AS PRCHSPRIC , 0 AS PRCHSPRIC
, FOI.SLEPRIC AS CNSMRPRIC , FOI.SLEPRIC AS CNSMRPRIC
@@ -1315,6 +1341,10 @@
, '선불' AS DLVY_AMT_SETLE_MTH_NM , '선불' AS DLVY_AMT_SETLE_MTH_NM
, FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_NM , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_NM
, FOI.OPTN_CD_1 , FOI.OPTN_CD_1
, FOI.HSCODE
, FOI.REAL_WT
, FOI.VOL_TW
, FOI.PACKAGE_CNT
, FOSH.DLVY_MSSAGE_CN , FOSH.DLVY_MSSAGE_CN
, FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS SHIPPING_STTUS_NM , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS SHIPPING_STTUS_NM
, CASE WHEN FO.SUBSVC_AT = 'Y' , CASE WHEN FO.SUBSVC_AT = 'Y'
@@ -1329,11 +1359,16 @@
, GOI.ORDR_GOODS_INNB , GOI.ORDR_GOODS_INNB
, GOI.ORDR_GOODS_OPTN_INNB , GOI.ORDR_GOODS_OPTN_INNB
, GOI.OPTN_CD_1 , GOI.OPTN_CD_1
, GOI.HSCODE
, GOI.REAL_WT
, GOI.VOL_TW
, GOI.PACKAGE_CNT
, GOI.ORDR_STTUS_CD , GOI.ORDR_STTUS_CD
, LAG(GOI.ORDR_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_INNB , LAG(GOI.ORDR_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_INNB
, LAG(GOI.ORDR_DLVY_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_DLVY_INNB , LAG(GOI.ORDR_DLVY_INNB) OVER(ORDER BY GOI.ORDR_INNB) AS REV_ORDR_DLVY_INNB
, MAX(FN_GET_GOODS_IMAGE(GOI.SOPMAL_CD, GOI.GOODS_INNB, '03')) AS GOODS_IMG_COURS , MAX(FN_GET_GOODS_IMAGE(GOI.SOPMAL_CD, GOI.GOODS_INNB, '03')) AS GOODS_IMG_COURS
, MAX(GOI.GOODS_NM) AS GOODS_NM , MAX(GOI.GOODS_NM) AS GOODS_NM
, MAX(GOI.GOODS_NM_EN) AS GOODS_NM_EN
, MAX(FN_GET_ORDER_GOODS_OPTN_NAME(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_OPTN_INNB)) AS OPTN_NM , MAX(FN_GET_ORDER_GOODS_OPTN_NAME(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_OPTN_INNB)) AS OPTN_NM
, SUM(GOI.ORDR_QY) AS ORDR_QY , SUM(GOI.ORDR_QY) AS ORDR_QY
, SUM(GOI.SLEPRIC) AS SLEPRIC , SUM(GOI.SLEPRIC) AS SLEPRIC
@@ -1363,6 +1398,10 @@
, GOI.ORDR_GOODS_INNB , GOI.ORDR_GOODS_INNB
, GOI.ORDR_GOODS_OPTN_INNB , GOI.ORDR_GOODS_OPTN_INNB
, GOI.OPTN_CD_1 , GOI.OPTN_CD_1
, GOI.HSCODE
, GOI.REAL_WT
, GOI.VOL_TW
, GOI.PACKAGE_CNT
, GOI.ORDR_STTUS_CD , GOI.ORDR_STTUS_CD
) FOI ) FOI
ON FOI.SOPMAL_CD = FO.SOPMAL_CD ON FOI.SOPMAL_CD = FO.SOPMAL_CD