From 3b8eba8e0bacadc5b161becb6f862d344d3e0ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 4 Feb 2026 17:59:00 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=B0=B0=EC=86=A1=EC=A7=80=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D/=EC=88=98=EC=A0=95=20-=20=EC=9D=BC=EB=B3=B8?= =?UTF-8?q?=20=EC=A3=BC=EC=86=8C(=EC=9D=BC=EB=B3=B8=EC=96=B4)=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EC=B6=94=EA=B0=80(=EB=AA=A8=EB=B0=94=EC=9D=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gcone/ordr/ordr/vo/BOCrmDlvylcVO.java | 7 +- .../domain/sopmal/mpage/mbr/vo/DlvylcVO.java | 7 +- .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 4 + src/main/resources/static/js/dlvylc/dlvylc.js | 11 +-- .../static/js/mngr/js/crm/dlvylc/dlvylc_2.js | 11 +-- .../static/mngr/js/crm/dlvylc/dlvylc.js | 11 +-- .../static/mngr/js/crm/dlvylc/dlvylc_2.js | 11 +-- .../sopmal/mpage/mbr/DlvylcRegistPopupC.jsp | 7 ++ .../sopmal/mpage/mbr/DlvylcUpdtPopupU.jsp | 7 ++ .../sopmal_m/mpage/mbr/DlvylcRegistPopupC.jsp | 67 +++++++++----- .../sopmal_m/mpage/mbr/DlvylcUpdtPopupU.jsp | 87 ++++++++++++------- 11 files changed, 155 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java index 144e0721..6f8b6270 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java @@ -40,7 +40,7 @@ public class BOCrmDlvylcVO extends AbstractVO{ private String telnb; /** 우편번호 */ @NotBlank(message = "우편번호") - @Length(min=1, max=5) + @Length(min=1, max=7) private String zip; /** 도로명,지번 구분*/ private String adresDv; @@ -52,9 +52,10 @@ public class BOCrmDlvylcVO extends AbstractVO{ private String rnmAdres = ""; /** 상세주소 */ private String dtlAdres; - /** 개인통관부호(개인통관번호) */ - @NotBlank(message = "개인통관부호(개인통관번호)") + /** 개인통관부호(개인통관번호) */ private String cstmclerCd; + /** 도도부현 코드(일본) */ + private String prefcd; /** 기본배송지여부 */ private String dftDlvylcAt = "N"; /** 최근배송지여부 */ diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java index 989a5bab..17f3fcd6 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java @@ -32,7 +32,7 @@ public class DlvylcVO extends AbstractVO{ private String telnb; /** 우편번호 */ @NotBlank(message = "우편번호") - @Length(min=1, max=5) + @Length(min=1, max=7) private String zip; /** 도로명,지번 구분 */ private String adresDv; @@ -45,9 +45,10 @@ public class DlvylcVO extends AbstractVO{ /** 상세주소 */ @NotBlank(message = "상세주소") private String dtlAdres; - /** 개인통관부호(개인통관번호) */ - @NotBlank(message = "개인통관부호(개인통관번호)") + /** 개인통관부호(개인통관번호) */ private String cstmclerCd; + /** 도도부현 코드(일본) */ + private String prefcd; /** 기본배송지여부 */ private String dftDlvylcAt = "N"; /** 최근배송지여부 */ diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml index 048d4a67..07d4ece0 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml @@ -182,6 +182,7 @@ DLVYLC_AREA_CD, RECPNT_NM, ZIP, + PREFCD, DLVYLC_DC_CN, LNB_ADRES, RNM_ADRES, @@ -229,6 +230,7 @@ TELNB, MBTLNB, ZIP, + PREFCD, ADRES_DV, LNB_ADRES, RNM_ADRES, @@ -250,6 +252,7 @@ #{telnb}, HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), '1df5be2f7e90ae36')), #{zip}, + #{prefcd}, #{adresDv}, #{lnbAdres}, #{rnmAdres}, @@ -274,6 +277,7 @@ RECPNT_NM = #{recpntNm}, MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), '1df5be2f7e90ae36')), ZIP = #{zip}, + PREFCD = #{prefcd}, ADRES_DV = #{adresDv}, RNM_ADRES = #{rnmAdres}, LNB_ADRES = #{lnbAdres}, diff --git a/src/main/resources/static/js/dlvylc/dlvylc.js b/src/main/resources/static/js/dlvylc/dlvylc.js index 8185217e..ce8c888b 100644 --- a/src/main/resources/static/js/dlvylc/dlvylc.js +++ b/src/main/resources/static/js/dlvylc/dlvylc.js @@ -386,17 +386,17 @@ const fn_update_dlvylc = function (pageIndex,msg,isMobile) { $('.' + id).show(); if (id == 'langJp') { - $('#cstmclerCd').prop('disabled', true); $('#zip').prop('readonly', false); $('#dtlAdres').attr('placeholder', '以降の住所を入力してください。'); - $('#mbtlnb').attr('placeholder', ''); - $('#prefcode').prop('disabled', true); + $('#mbtlnb').attr('placeholder', '電話番号をハイフンなしで入力してください。'); + $('#cstmclerCd').prop('disabled', true); + $('#prefcode').prop('disabled', false); } else { - $('#cstmclerCd').prop('disabled', false); $('#zip').prop('readonly', true); $('#dtlAdres').attr('placeholder', '나머지 주소를 입력해 주세요'); $('#mbtlnb').attr('placeholder', '휴대폰번호\'-\'없이 입력하세요'); - $('#prefcode').prop('disabled', false); + $('#cstmclerCd').prop('disabled', false); + $('#prefcode').prop('disabled', true); $('#postcodeAlert').hide(); } @@ -430,6 +430,7 @@ const fn_update_dlvylc = function (pageIndex,msg,isMobile) { $("#adres").val(adres); $("#dtlAdres").val(dtlAdres); $("#prefcode").val(prefcode); + $("#adresDv").val("01"); } else { $('#postcodeAlert').show(); } diff --git a/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js b/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js index 489ce982..860914b6 100644 --- a/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js +++ b/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js @@ -335,17 +335,17 @@ const fn_toggle_langHeader = function () { $('.' + id).show(); if (id == 'langJp') { - $('#cstmclerCd').prop('disabled', true); $('#zip').prop('readonly', false); $('#dtlAdres').attr('placeholder', '以降の住所を入力してください。'); - $('#mbtlnb').attr('placeholder', ''); - $('#prefcode').prop('disabled', true); + $('#mbtlnb').attr('placeholder', '電話番号をハイフンなしで入力してください。'); + $('#cstmclerCd').prop('disabled', true); + $('#prefcode').prop('disabled', false); } else { - $('#cstmclerCd').prop('disabled', false); $('#zip').prop('readonly', true); $('#dtlAdres').attr('placeholder', '나머지 주소를 입력해 주세요'); $('#mbtlnb').attr('placeholder', '휴대폰번호\'-\'없이 입력하세요'); - $('#prefcode').prop('disabled', false); + $('#cstmclerCd').prop('disabled', false); + $('#prefcode').prop('disabled', true); $('#postcodeAlert').hide(); } @@ -379,6 +379,7 @@ const fn_set_postcodeJp = function (Data) { $("#adres").val(adres); $("#dtlAdres").val(dtlAdres); $("#prefcode").val(prefcode); + $("#adresDv").val("01"); } else { $('#postcodeAlert').show(); } diff --git a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js index 91497d6e..c7263d56 100644 --- a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js +++ b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js @@ -325,17 +325,17 @@ const fn_toggle_langHeader = function () { $('.' + id).show(); if (id == 'langJp') { - $('#cstmclerCd').prop('disabled', true); $('#zip').prop('readonly', false); $('#dtlAdres').attr('placeholder', '以降の住所を入力してください。'); - $('#mbtlnb').attr('placeholder', ''); - $('#prefcode').prop('disabled', true); + $('#mbtlnb').attr('placeholder', '電話番号をハイフンなしで入力してください。'); + $('#cstmclerCd').prop('disabled', true); + $('#prefcode').prop('disabled', false); } else { - $('#cstmclerCd').prop('disabled', false); $('#zip').prop('readonly', true); $('#dtlAdres').attr('placeholder', '나머지 주소를 입력해 주세요'); $('#mbtlnb').attr('placeholder', '휴대폰번호\'-\'없이 입력하세요'); - $('#prefcode').prop('disabled', false); + $('#cstmclerCd').prop('disabled', false); + $('#prefcode').prop('disabled', true); $('#postcodeAlert').hide(); } @@ -369,6 +369,7 @@ const fn_set_postcodeJp = function (Data) { $("#adres").val(adres); $("#dtlAdres").val(dtlAdres); $("#prefcode").val(prefcode); + $("#adresDv").val("01"); } else { $('#postcodeAlert').show(); } diff --git a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js index 489ce982..860914b6 100644 --- a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js +++ b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js @@ -335,17 +335,17 @@ const fn_toggle_langHeader = function () { $('.' + id).show(); if (id == 'langJp') { - $('#cstmclerCd').prop('disabled', true); $('#zip').prop('readonly', false); $('#dtlAdres').attr('placeholder', '以降の住所を入力してください。'); - $('#mbtlnb').attr('placeholder', ''); - $('#prefcode').prop('disabled', true); + $('#mbtlnb').attr('placeholder', '電話番号をハイフンなしで入力してください。'); + $('#cstmclerCd').prop('disabled', true); + $('#prefcode').prop('disabled', false); } else { - $('#cstmclerCd').prop('disabled', false); $('#zip').prop('readonly', true); $('#dtlAdres').attr('placeholder', '나머지 주소를 입력해 주세요'); $('#mbtlnb').attr('placeholder', '휴대폰번호\'-\'없이 입력하세요'); - $('#prefcode').prop('disabled', false); + $('#cstmclerCd').prop('disabled', false); + $('#prefcode').prop('disabled', true); $('#postcodeAlert').hide(); } @@ -379,6 +379,7 @@ const fn_set_postcodeJp = function (Data) { $("#adres").val(adres); $("#dtlAdres").val(dtlAdres); $("#prefcode").val(prefcode); + $("#adresDv").val("01"); } else { $('#postcodeAlert').show(); } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcRegistPopupC.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcRegistPopupC.jsp index 48fc7a37..4e5df9ff 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcRegistPopupC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcRegistPopupC.jsp @@ -26,6 +26,13 @@ $('[name=dlvylcAreaCd]').on('change', fn_toggle_langHeader) .on('change', fn_clear_dlvylcForm); fn_toggle_langHeader(); + + /*ENTER 키 입력 시 submit 방지*/ + $('#dlvylcRegistForm').on('keydown', function(e) { + if (e.keyCode == 13) { + e.preventDefault(); + } + }); });