fix : 배송지 등록/수정 수정

fix : 상품 메뉴(카테고리) column 수 변경

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java

@@ -26,6 +26,8 @@ public class BOCrmDlvylcVO extends AbstractVO{
 	@NotBlank(message = "배송지 설명")
 	@Length(min=1, max=67)
 	private String dlvylcDcCn;
+	/**배송지역코드*/
+	private String dlvylcAreaCd;
 	/**	받는사람명	*/
 	@NotBlank(message = "받으시는 분")
 	@Length(min=1, max=13)
@@ -50,6 +52,9 @@ public class BOCrmDlvylcVO extends AbstractVO{
 	private String rnmAdres = "";
 	/**	상세주소	*/
 	private String dtlAdres;
+	/**	개인통관부호(개인통관번호)	*/
+	@NotBlank(message = "개인통관부호(개인통관번호)")
+	private String cstmclerCd;
 	/**	기본배송지여부	*/
 	private String dftDlvylcAt = "N";
 	/**	최근배송지여부	*/

src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java

@@ -19,6 +19,8 @@ public class DlvylcVO extends AbstractVO{
 	/**	배송지설명내용 */
 	@NotBlank(message = "배송지 설명")
 	private String dlvylcDcCn;
+	/**배송지역코드*/
+	private String dlvylcAreaCd;
 	/**	받는사람명	*/
 	@NotBlank(message = "받으시는 분")
 	private String recpntNm;
@@ -43,6 +45,9 @@ public class DlvylcVO extends AbstractVO{
 	/**	상세주소	*/
 	@NotBlank(message = "상세주소")
 	private String dtlAdres;
+	/**	개인통관부호(개인통관번호)	*/
+	@NotBlank(message = "개인통관부호(개인통관번호)")
+	private String cstmclerCd;
 	/**	기본배송지여부	*/
 	private String dftDlvylcAt = "N";
 	/**	최근배송지여부	*/

src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml

@@ -179,12 +179,14 @@
         SELECT
                 ADBK_INNB,
                 MBR_INNB,
+                DLVYLC_AREA_CD,
                 RECPNT_NM,
                 ZIP,
                 DLVYLC_DC_CN,
                 LNB_ADRES,
                 RNM_ADRES,
                 DTL_ADRES,
+                CSTMCLER_CD,
                 CAST(AES_DECRYPT(UNHEX(MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)) AS MBTLNB,
                 DFT_DLVYLC_AT,
                 REGIST_DT,
@@ -222,6 +224,7 @@
                 MBR_DV_CD,
                 MBR_INNB,
                 DLVYLC_DC_CN,
+                DLVYLC_AREA_CD,
                 RECPNT_NM,
                 TELNB,
                 MBTLNB,
@@ -230,6 +233,7 @@
                 LNB_ADRES,
                 RNM_ADRES,
                 DTL_ADRES,
+                CSTMCLER_CD,
                 DFT_DLVYLC_AT,
                 RECENT_DLVYLC_AT,
                 REGUSR,
@@ -241,6 +245,7 @@
                 #{mbrDvCd},
                 #{mbrInnb},
                 #{dlvylcDcCn},
+                #{dlvylcAreaCd},
                 #{recpntNm},
                 #{telnb},
                 HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), '1df5be2f7e90ae36')),
@@ -249,6 +254,7 @@
                 #{lnbAdres},
                 #{rnmAdres},
                 #{dtlAdres},
+                #{cstmclerCd},
                 #{dftDlvylcAt},
                 #{recentDlvylcAt},
                 #{regusr},
@@ -264,6 +270,7 @@
         <![CDATA[
             UPDATE GC_DELIVERY_ADDRESS
             SET
+            DLVYLC_AREA_CD= #{dlvylcAreaCd},
             RECPNT_NM     = #{recpntNm},
             MBTLNB 	      = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), '1df5be2f7e90ae36')),
             ZIP           = #{zip},
@@ -271,6 +278,7 @@
             RNM_ADRES     = #{rnmAdres},
             LNB_ADRES     = #{lnbAdres},
             DTL_ADRES     = #{dtlAdres},
+            CSTMCLER_CD     = #{cstmclerCd},
             DFT_DLVYLC_AT = #{dftDlvylcAt},
             UPDUSR        = #{updusr},
             UPDT_DT       = SYSDATE(),

src/main/resources/static/js/dlvylc/dlvylc.js

@@ -105,6 +105,7 @@ const fn_move_dlvylc_manage_full = function (pageIndex, callback, formId = '') {
  배송지 등록 팝업 호출
  ***********************************************/
 const fn_move_dlvylc_regpage_pop = function (isPop, dftDlvylcAt) {
+    $("#dlvylcUpdate").remove();
     $.ajax({
         type: 'post',
         url: '/sopmal/mpage/mbr/selectDlvylcRegistForm',
@@ -132,7 +133,6 @@ const fn_move_dlvylc_regpage = function (dftDlvylcAt) {
  배송지 등록
  ***********************************************/
 const fn_insert_dlvylc = function (msg, data, isMobile) {
-    $("#dlvylcUpdate").remove();
     let paramData = null;
     const registForm = $("#dlvylcRegistForm").serialize();
     if (data != null) {
@@ -374,3 +374,21 @@ const fn_update_dlvylc = function (pageIndex,msg,isMobile) {
         }, formId);
         fn_close_modal("dlvylcManage");
     }
+
+    /**********************************************
+     배송지 관리 팝업 언어 설정
+     ***********************************************/
+    const fn_toggle_langHeader = function () {
+        var id = $('[name=dlvylcAreaCd]:checked').attr('id');
+
+        $('.langKr, .langJp').hide();
+        $('.' + id).show();
+
+        if (id == 'langJp') {
+            $('#cstmclerCd').prop('disabled', true);
+            $('#zip').prop('readonly', false);
+        } else {
+            $('#cstmclerCd').prop('disabled', false);
+            $('#zip').prop('readonly', true);
+        }
+    }

src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js

@@ -119,6 +119,7 @@ const fn_move_dlvylc_manage_pop_wrapper = function (pageIndex) {
  배송지 등록 팝업 호출 ok
  ***********************************************/
 const fn_move_dlvylc_regpage_pop = function (isPop, mbrInnb, mbrDvCd, dftDlvylcAt) {
+    $("#dlvylcUpdate").remove();
     if (!mbrInnb) {
         mbrInnb = $("#leftMbrInnb").val();
     }
@@ -149,7 +150,6 @@ const fn_move_dlvylc_regpage_pop = function (isPop, mbrInnb, mbrDvCd, dftDlvylcA
  배송지 등록 ok
  ***********************************************/
 const fn_insert_dlvylc = function (mbrInnb, mbrDvCd, msg, data) {
-    $("#dlvylcUpdate").remove();
     let paramData = null;
     const registForm = $("#dlvylcRegistForm").serialize();
     if (data != null) {
@@ -323,3 +323,21 @@ const fn_select_mngrOrdr_postcode = function (callback, index, formId = '') {
     }, formId);
     fn_close_modal("dlvylcManage");
 }
+
+/**********************************************
+ 배송지 관리 팝업 언어 설정
+ ***********************************************/
+const fn_toggle_langHeader = function () {
+    var id = $('[name=dlvylcAreaCd]:checked').attr('id');
+
+    $('.langKr, .langJp').hide();
+    $('.' + id).show();
+
+    if (id == 'langJp') {
+        $('#cstmclerCd').prop('disabled', true);
+        $('#zip').prop('readonly', false);
+    } else {
+        $('#cstmclerCd').prop('disabled', false);
+        $('#zip').prop('readonly', true);
+    }
+}

src/main/resources/static/login/sopmall/pc/css/default.css

@@ -9112,10 +9112,10 @@ main {
   padding: 32px 32px;
 }
 .subList__list__inner {
-  width: 960px;
+  width: 1080px;
   margin-inline: auto;
   display: grid;
-  grid-template-columns: repeat(5, 1fr);
+  grid-template-columns: repeat(3, 1fr);
   gap: 16px;
 }
 .subList__list__item {

src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js

@@ -108,6 +108,7 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
  배송지 등록 팝업 호출 ok
  ***********************************************/
 const fn_move_dlvylc_regpage_pop = function (isPop, mbrInnb, mbrDvCd, dftDlvylcAt) {
+    $("#dlvylcUpdate").remove();
     if (!mbrInnb) {
         mbrInnb = $("#leftMbrInnb").val();
     }
@@ -138,7 +139,6 @@ const fn_move_dlvylc_regpage_pop = function (isPop, mbrInnb, mbrDvCd, dftDlvylcA
  배송지 등록 ok
  ***********************************************/
 const fn_insert_dlvylc = function (mbrInnb, mbrDvCd, msg, data) {
-    $("#dlvylcUpdate").remove();
     let paramData = null;
     const registForm = $("#dlvylcRegistForm").serialize();
     if (data != null) {
@@ -313,3 +313,21 @@ const fn_select_mngrOrdr_postcode = function (callback, index) {
     });
     fn_close_modal("dlvylcManage");
 }
+
+/**********************************************
+ 배송지 관리 팝업 언어 설정
+ ***********************************************/
+const fn_toggle_langHeader = function () {
+    var id = $('[name=dlvylcAreaCd]:checked').attr('id');
+
+    $('.langKr, .langJp').hide();
+    $('.' + id).show();
+
+    if (id == 'langJp') {
+        $('#cstmclerCd').prop('disabled', true);
+        $('#zip').prop('readonly', false);
+    } else {
+        $('#cstmclerCd').prop('disabled', false);
+        $('#zip').prop('readonly', true);
+    }
+}

src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js

@@ -119,6 +119,7 @@ const fn_move_dlvylc_manage_pop_wrapper = function (pageIndex) {
  배송지 등록 팝업 호출 ok
  ***********************************************/
 const fn_move_dlvylc_regpage_pop = function (isPop, mbrInnb, mbrDvCd, dftDlvylcAt) {
+    $("#dlvylcUpdate").remove();
     if (!mbrInnb) {
         mbrInnb = $("#leftMbrInnb").val();
     }
@@ -149,7 +150,6 @@ const fn_move_dlvylc_regpage_pop = function (isPop, mbrInnb, mbrDvCd, dftDlvylcA
  배송지 등록 ok
  ***********************************************/
 const fn_insert_dlvylc = function (mbrInnb, mbrDvCd, msg, data) {
-    $("#dlvylcUpdate").remove();
     let paramData = null;
     const registForm = $("#dlvylcRegistForm").serialize();
     if (data != null) {
@@ -323,3 +323,21 @@ const fn_select_mngrOrdr_postcode = function (callback, index, formId = '') {
     }, formId);
     fn_close_modal("dlvylcManage");
 }
+
+/**********************************************
+ 배송지 관리 팝업 언어 설정
+ ***********************************************/
+const fn_toggle_langHeader = function () {
+    var id = $('[name=dlvylcAreaCd]:checked').attr('id');
+
+    $('.langKr, .langJp').hide();
+    $('.' + id).show();
+
+    if (id == 'langJp') {
+        $('#cstmclerCd').prop('disabled', true);
+        $('#zip').prop('readonly', false);
+    } else {
+        $('#cstmclerCd').prop('disabled', false);
+        $('#zip').prop('readonly', true);
+    }
+}

src/main/resources/static/pc/css/default.css

@@ -9142,10 +9142,10 @@ main {
   padding: 32px 32px;
 }
 .subList__list__inner {
-  width: 960px;
+  width: 1080px;
   margin-inline: auto;
   display: grid;
-  grid-template-columns: repeat(5, 1fr);
+  grid-template-columns: repeat(3, 1fr);
   gap: 16px;
 }
 .subList__list__item {

src/main/resources/static/sopmall/pc/css/default.css

@@ -9112,10 +9112,10 @@ main {
   padding: 32px 32px;
 }
 .subList__list__inner {
-  width: 960px;
+  width: 1080px;
   margin-inline: auto;
   display: grid;
-  grid-template-columns: repeat(5, 1fr);
+  grid-template-columns: repeat(3, 1fr);
   gap: 16px;
 }
 .subList__list__item {

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcRegistPopupC.jsp

@@ -17,12 +17,28 @@
 --%>
 <html>
 <!-- 배송지 등록-->
+<script>
+    $(document).ready(function () {
+        $('[name=dlvylcAreaCd]').on('change', fn_toggle_langHeader);
+        fn_toggle_langHeader();
+    });
+</script>
 <div id="dlvylcRegist" class="modal default" style="max-width: 600px;">
-        <div class="modal-header">
-            <div class="modal-header__title">배송지 등록</div>
-        </div>
     <form id = "dlvylcRegistForm">
+        <div class="modal-header">
+            <div class="modal-header__title">배송지 등록 (配送先登録)</div>
+        </div>
         <div class="modal-content">
+            <div class="custom-radio-container">
+                <div class="custom-radio">
+                    <input type="radio" id="langKr" name="dlvylcAreaCd" value="KR" checked>
+                    <label for="langKr">KR</label>
+                </div>
+                <div class="custom-radio">
+                    <input type="radio" id="langJp" name="dlvylcAreaCd" value="JP">
+                    <label for="langJp">JP</label>
+                </div>
+            </div>
             <table class="table-address">
                 <caption>해당 테이블에 대한 내용</caption>
                 <colgroup>
@@ -31,45 +47,61 @@
                 </colgroup>
                 <tbody>
                     <tr>
-                            <th>배송지명<span class="required-asterisk">*</span></th>
+                        <th class="langKr">배송지명<span class="required-asterisk">*</span></th>
+                        <th class="langJp">配送先名<span class="required-asterisk">*</span></th>
                         <td>
                             <input type="text" class="m-input" name="dlvylcDcCn"  title="배송지명" maxlength="67">
                         </td>
                     </tr>
                     <tr>
-                            <th>받으시는 분<span class="required-asterisk">*</span></th>
+                        <th class="langKr">받으시는 분<span class="required-asterisk">*</span></th>
+                        <th class="langJp">お届け先<span class="required-asterisk">*</span></th>
                         <td>
                             <input type="text" class="m-input" title="받으시는 분" name="recpntNm" title="받으시는 분" maxlength="13">
                         </td>
                     </tr>
                     <tr>
-                            <th>배송지 주소<span class="required-asterisk">*</span></th>
+                        <th class="langKr">배송지 주소<span class="required-asterisk">*</span></th>
+                        <th class="langJp">郵便番号<span class="required-asterisk">*</span></th>
                         <td>
-                                <input type="text" class="m-input short" id="zip" name="zip"  title="우편번호" maxlength="5" readonly>
+                            <input type="text" class="m-input short" id="zip" name="zip"  title="우편번호" maxlength="7" readonly>
-                                <button class="find-address-btn" onclick="fn_select_postcode(fn_select_dlvylc_postcode); return false;">우편번호 찾기</button>
+                            <button class="find-address-btn langKr" onclick="fn_select_postcode(fn_select_dlvylc_postcode); return false;">우편번호 찾기</button>
+                            <button class="find-address-btn langJp" onclick="fn_select_postcodeJp(); return false;">検索</button>
                             <input type="text" class="m-input long my" id="adres" name="adres"  maxlength="66" readonly title="주소">
                             <input type="text" class="m-input long" id="dtlAdres" name="dtlAdres" title="상세주소" maxlength="66" placeholder="나머지 주소를 입력해 주세요">
                         </td>
                     </tr>
                     <tr>
-                            <th>휴대전화번호<span class="required-asterisk">*</span></th>
+                        <th class="langKr">휴대전화번호<span class="required-asterisk">*</span></th>
+                        <th class="langJp">電話番号<span class="required-asterisk">*</span></th>
                         <td>
                             <input name="mbtlnb" type="text" class="m-input telno" title="휴대전화번호"  maxlength="13" placeholder="휴대폰번호'-'없이 입력하세요">
                         </td>
                     </tr>
+                    <tr class="langKr">
+                        <th>개인통관번호<br>(개인통관부호)<span class="required-asterisk">*</span></th>
+                        <td>
+                            <input type="text" class="m-input" id="cstmclerCd" name="cstmclerCd" title="개인통관번호(개인통관부호)" maxlength="13" placeholder="P로 시작하는 13자리 부호를 입력하세요">
+                            <button class="find-address-btn" onclick="window.open('https://unipass.customs.go.kr/per/persIndex.do', '_blank'); return false;">통관번호 조회</button>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
             <div class="shipping-register-bottom">
                 <label class="b-checkbox checkbox is-medium">
                     <input type="checkbox" id="dftDlvylcAt" name="dftDlvylcAt" value="Y">
                     <span class="check"></span>
-                        <span class="control-label">기본 배송지</span>
+                    <span class="control-label langKr">기본 배송지</span>
+                    <span class="control-label langJp">既定の配送先</span>
                 </label>
             </div>
             <div class="shipping-btn-container">
-                    <a href="#" rel="modal:close" class="btn large outline">취소</a>
+                <a href="#" rel="modal:close" class="btn large outline langKr">취소</a>
-                    <button type="button" id="DlvylcRegistBtn" class="btn theme large"
+                <a href="#" rel="modal:close" class="btn large outline langJp">キャンセル</a>
+                <button type="button" class="btn theme large langKr"
                         onclick="fn_insert_dlvylc('<spring:message code='success.common.insert'/>'); return false;">등록하기</button>
+                <button type="button" class="btn theme large langJp"
+                        onclick="fn_insert_dlvylc('<spring:message code='success.common.insert'/>'); return false;">登録</button>
             </div>
         </div>
         <input type="hidden" id="adresDv" name="adresDv">

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcUpdtPopupU.jsp

@@ -19,14 +19,27 @@
 <script>
     $(document).ready(function (){
         $(".telno").val(fn_format_mbtlnb($(".telno").val()));
+
+        $('[name=dlvylcAreaCd]').on('change', fn_toggle_langHeader);
+        fn_toggle_langHeader();
     });
 </script>
 <div id="dlvylcUpdate" class="modal default" style="max-width: 600px;">
     <form id="dlvylcUpdtForm" name="dlvylcUpdtForm" action="<c:url value="/crm/dlvylc/updateDlvylcUpdt"/>" method="post">
         <div class="modal-header">
-            <div class="modal-header__title">배송지 수정</div>
+            <div class="modal-header__title">배송지 수정 (配送先変更)</div>
         </div>
         <div class="modal-content">
+            <div class="custom-radio-container">
+                <div class="custom-radio">
+                    <input type="radio" id="langKr" name="dlvylcAreaCd" value="KR" <c:if test="${'KR' eq dtlDlvylc.resultVO.dlvylcAreaCd}">checked</c:if>>
+                    <label for="langKr">KR</label>
+                </div>
+                <div class="custom-radio">
+                    <input type="radio" id="langJp" name="dlvylcAreaCd" value="JP" <c:if test="${'JP' eq dtlDlvylc.resultVO.dlvylcAreaCd}">checked</c:if>>
+                    <label for="langJp">JP</label>
+                </div>
+            </div>
             <table class="table-address">
                 <caption>해당 테이블에 대한 내용</caption>
                 <colgroup>
@@ -35,22 +48,26 @@
                 </colgroup>
                 <tbody>
                 <tr>
-                    <th>배송지명<span class="required-asterisk">*</span></th>
+                    <th class="langKr">배송지명<span class="required-asterisk">*</span></th>
+                    <th class="langJp">配送先名<span class="required-asterisk">*</span></th>
                     <td>
                         <input type="text" class="m-input" name="dlvylcDcCn" title="배송지명" value="<c:out value = "${dtlDlvylc.resultVO.dlvylcDcCn}" />" maxlength="67">
                     </td>
                 </tr>
                 <tr>
-                    <th>받으시는 분<span class="required-asterisk">*</span></th>
+                    <th class="langKr">받으시는 분<span class="required-asterisk">*</span></th>
+                    <th class="langJp">お届け先<span class="required-asterisk">*</span></th>
                     <td>
                         <input type="text" class="m-input" title="받으시는 분" name="recpntNm" title="받으시는 분" value="<c:out value="${dtlDlvylc.resultVO.recpntNm}" />" maxlength="13">
                     </td>
                 </tr>
                 <tr>
-                    <th>배송지 주소<span class="required-asterisk">*</span></th>
+                    <th class="langKr">배송지 주소<span class="required-asterisk">*</span></th>
+                    <th class="langJp">郵便番号<span class="required-asterisk">*</span></th>
                     <td>
-                        <input type="text" class="m-input short" id="zip" name="zip"  title="우편번호" value="<c:out value = "${dtlDlvylc.resultVO.zip}"/>" maxlength="5" readonly>
+                        <input type="text" class="m-input short" id="zip" name="zip"  title="우편번호" value="<c:out value = "${dtlDlvylc.resultVO.zip}"/>" maxlength="7" readonly>
-                        <button class="find-address-btn" onclick="fn_select_postcode(fn_select_dlvylc_postcode); return false;">우편번호 찾기</button>
+                        <button class="find-address-btn langKr" onclick="fn_select_postcode(fn_select_dlvylc_postcode); return false;">우편번호 찾기</button>
+                        <button class="find-address-btn langJp" onclick="fn_select_postcodeJp(); return false;">検索</button>
                         <input type="text" class="m-input long my" id="adres" name="adres"  title="주소" maxlength="66"
                                value=<c:choose>
                                         <c:when test = "${dtlDlvylc.resultVO.adresDv eq '01'}">'<c:out value = "${dtlDlvylc.resultVO.rnmAdres}"/>'</c:when>
@@ -61,12 +78,21 @@
                     </td>
                 </tr>
                 <tr>
-                    <th>휴대전화번호<span class="required-asterisk">*</span></th>
+                    <th class="langKr">휴대전화번호<span class="required-asterisk">*</span></th>
+                    <th class="langJp">電話番号<span class="required-asterisk">*</span></th>
                     <td>
                         <input name="mbtlnb" type="text" class="m-input telno" title="휴대전화번호"  value="<c:out value = "${dtlDlvylc.resultVO.mbtlnb}"/>"
                                maxlength="13" placeholder="휴대폰번호'-'없이 입력하세요">
                     </td>
                 </tr>
+                <tr class="langKr">
+                    <th>개인통관번호<br>(개인통관부호)<span class="required-asterisk">*</span></th>
+                    <td>
+                        <input type="text" class="m-input" id="cstmclerCd" name="cstmclerCd" title="개인통관번호(개인통관부호)" value="<c:out value = "${dtlDlvylc.resultVO.cstmclerCd}"/>"
+                               maxlength="13" placeholder="P로 시작하는 13자리 부호를 입력하세요">
+                        <button class="find-address-btn" onclick="window.open('https://unipass.customs.go.kr/per/persIndex.do', '_blank'); return false;">통관번호 조회</button>
+                    </td>
+                </tr>
                 </tbody>
             </table>
             <div class="shipping-register-bottom">