공급업체출고처관리 > 택배사 추가건

src/main/java/com/style24/persistence/domain/DeliveryLoc.java

@@ -33,7 +33,9 @@ public class DeliveryLoc extends TscBaseDomain {
 	private String rtnLocNm;			// 반품처명
 	private String invoicePrintType;	// 송장출력형태(공통코드G025)
 	private String useYn;				// 사용여부
-
+	private String shipCompCd;			// 배송업체코드
+	private String shipCompNm;			// 배송업체명
+	
 	// 검색조건
 	private String searchGb;
 	private String searchTxt;

src/main/java/com/style24/persistence/mybatis/shop/TssBusiness.xml

@@ -163,9 +163,12 @@
 		     , DL.RTN_LOC_DTL_ADDR   /*반품처상세주소*/
 		     , DL.RTN_LOC_NM         /*반품처명*/
 		     , DL.USE_YN             /*사용여부*/
+		     , SCM.SHIP_COMP_CD       /*배송업체코드*/
+		     , SCM.SHIP_COMP_NM       /*배송업체명*/
 		FROM   TB_DELIVERY_LOC DL
-		     , TB_SUPPLY_COMPANY SC
-		WHERE  DL.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		INNER JOIN 		 TB_SUPPLY_COMPANY SC ON DL.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		LEFT OUTER JOIN  TB_SHIP_COMPANY SCM ON DL.SHIP_COMP_CD = SCM.SHIP_COMP_CD  
+		WHERE  1=1
 		AND    DL.SUPPLY_COMP_CD = #{supplyCompCd}
 		<if test="delvLocNm != null and delvLocNm !=''">
 		AND    LOWER(DL.DELV_LOC_NM) LIKE CONCAT('%',LOWER(#{delvLocNm}),'%')
@@ -191,6 +194,7 @@
 		     , RTN_LOC_BASE_ADDR
 		     , RTN_LOC_DTL_ADDR
 		     , RTN_LOC_NM
+		     , SHIP_COMP_CD
 		     , USE_YN
 		     , REG_NO
 		     , REG_DT
@@ -216,6 +220,7 @@
 		     , #{rtnLocBaseAddr}
 		     , #{rtnLocDtlAddr}
 		     , #{rtnLocNm}
+		     , #{shipCompCd}
 		     , 'Y'
 		     , #{regNo}
 		     , NOW()
@@ -231,6 +236,7 @@
 		     , RTN_LOC_BASE_ADDR = #{rtnLocBaseAddr}
 		     , RTN_LOC_DTL_ADDR = #{rtnLocDtlAddr}
 		     , RTN_LOC_NM = #{rtnLocNm}
+		     , SHIP_COMP_CD = #{shipCompCd}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 	</insert>

src/main/java/com/style24/scm/biz/web/TssBusinessController.java

@@ -118,6 +118,9 @@ public class TssBusinessController extends TssBaseController {
 
 		// 공급업체
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(TssSession.getInfo().getSupplyCompCd()));
+		
+		// 택배사명 목록
+		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
 
 		mav.setViewName("business/DeliveryLocForm");
 

src/main/webapp/WEB-INF/views/business/DeliveryLocForm.html

@@ -88,9 +88,16 @@
 					</colgroup>
 					<tr>
 						<th>출고처코드</th>
-						<td colspan="3">
+						<td>
 							<input type="text" class="w100" name="delvLocCd" maxlength="20" placeholder="자동생성" readonly="readonly"/>
 						</td>
+						<th>택배사<i class="required" title="필수"></i></th>
+						<td>
+							<select name="shipCompCd" required="required" data-valid-name="택배사">
+								<option value="">[선택]</option>
+								<option th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
 					</tr>
 					<tr>
 						<th>출고처명</th>
@@ -153,6 +160,7 @@
 		{ headerName: "반품처우편번호", field: "rtnLocZipcode", width: 150, cellClass: 'text-center' },
 		{ headerName: "반품처기본주소", field: "rtnLocBaseAddr", width: 300 },
 		{ headerName: "반품처상세주소", field: "rtnLocDtlAddr", width: 200 },
+		{ headerName: "택배사", field: "shipCompNm", width: 150, cellClass: 'text-center' },
 		{
 			headerName: "사용여부", field: "useYn", width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return params.data.useYn == 'Y' ? 'Yes' : 'No'; }
@@ -177,6 +185,7 @@
 		$('#detailForm input[name=rtnLocDtlAddr]').val(event.data.rtnLocDtlAddr);
 		$('#detailForm input[name=rtnLocNm]').val(event.data.rtnLocNm);
 		$('#detailForm input:radio[name=useYn]:input[value= ' + event.data.useYn + '] ').click();
+		$('#detailForm select[name=shipCompCd]').val(event.data.shipCompCd);
 	}
 
 	// 검색

src/main/webapp/dx5/dextuploadx5-configuration.js

@@ -1,4 +1,4 @@
-/*
+/*
  * DEXTUploadX5 Configuration javascript file
  * Copyright DEVPIA Inc.
  */
@@ -8,7 +8,7 @@
 
     var gAuthkey = '';
     if (location.host.indexOf("ld") > -1) {
-    	gAuthkey = "AERlxUVBuJS7+zZ6VF3bM+vRERay04YThSHF67lx+P+29qKQSw6++CkC/pPQCvAMXUcQXKLV/rvLUrCoODTzxeOAfz3dEq0no+qwTQXyF23FimJ772TnpSvbhvnMFaL1rYOZ6uxs2PeNuBY6X7uNhCYBstHxbN5RCjeAwCTN9tI=";
+    	gAuthkey = "8CtMKeRqXsnEPV4h6MT0jcyRMLAuqxXi/qZyQtgAmk/y1bubNPhWZp/4/4hAvC51h3I8GowuFHdnzAF4be2dv79kJkBcyEq0oRCRLGYkIthNDgEkEi1YmddXAeDTukLmmloTEMx+rW7KtoPNAw+CofGT9UUfboiMzSkKANtVGM4=";
     } else if (location.host.indexOf("lp") > -1) {
     	gAuthkey = "hr0AqviRLOCsbiIneYWPXdkhMn8awpDYw6HPDAvYo/cKKYVOyyuonGO2qFLlmur6svsAV6tkMZY5N1Iygq42R74h7AFlzk8xhM9YzIP8ySVhEN2LFlRxgsm/GQyLrzNoS1BwcHSYyOvAfzBCAVu6f8ubLw68bOFWivcvJKAz91I=";
     } else if (location.host.indexOf("td") > -1) {