총알배송여부 항목 추가

style24.admin/src/main/java/com/style24/admin/biz/web/TsaBusinessController.java

@@ -68,13 +68,16 @@ public class TsaBusinessController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 입점상태
-		mav.addObject("supplyStatList", rendererService.getCommonCodeList("G010"));
+		mav.addObject("supplyStatList", rendererService.getAvailCommonCodeList("G010"));
 
 		// 유통구분
-		mav.addObject("distributionGbList", rendererService.getCommonCodeList("G065"));
+		mav.addObject("distributionGbList", rendererService.getAvailCommonCodeList("G065"));
 
 		// 은행
-		mav.addObject("bankList", rendererService.getCommonCodeList("G940"));
+		mav.addObject("bankList", rendererService.getAvailCommonCodeList("G940"));
+
+		// 정산일
+		mav.addObject("settleDayList", rendererService.getAvailCommonCodeList("G075"));
 
 		mav.setViewName("business/SupplyCompanyForm");
 
@@ -125,10 +128,10 @@ public class TsaBusinessController extends TsaBaseController {
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(TsaSession.getInfo().getSupplyCompCd()));
 
 		// 출고처분류
-		mav.addObject("delvLocClsfList", rendererService.getCommonCodeList("G024"));
+		mav.addObject("delvLocClsfList", rendererService.getAvailCommonCodeList("G024"));
 
 		// 송장출력형태
-		mav.addObject("invoicePrintTypeList", rendererService.getCommonCodeList("G025"));
+		mav.addObject("invoicePrintTypeList", rendererService.getAvailCommonCodeList("G025"));
 
 		mav.setViewName("business/DeliveryLocForm");
 

style24.admin/src/main/java/com/style24/persistence/domain/SupplyCompany.java

@@ -29,6 +29,7 @@ public class SupplyCompany extends TscBaseDomain {
 	private String homepageUrl;			// 홈페이지URL
 	private String selfYn;				// 자사여부(Y:자사, N:입점)
 	private String distributionGb;		// 유통구분(공통코드G065)
+	private String shotDelvYn;			// 총알배송여부
 	private String supplyStat;			// 입점상태(공통코드G010)
 	private int minOrdAmt;				// 무료배송비최소주문금액
 	private int delvFee;				// 배송비

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaBusiness.xml

@@ -19,6 +19,7 @@
 		     , MAIN_FAXNO           /*대표팩스번호*/
 		     , HOMEPAGE_URL         /*홈페이지URL*/
 		     , DISTRIBUTION_GB      /*유통구분*/
+		     , SHOT_DELV_YN         /*총알배송여부*/
 		     , SUPPLY_STAT          /*입점상태*/
 		     , MIN_ORD_AMT          /*무료배송비최소주문금액*/
 		     , DELV_FEE             /*배송비*/
@@ -75,6 +76,7 @@
 		     , MAIN_FAXNO
 		     , HOMEPAGE_URL
 		     , DISTRIBUTION_GB
+		     , SHOT_DELV_YN
 		     , SUPPLY_STAT
 		     , MIN_ORD_AMT
 		     , DELV_FEE
@@ -115,6 +117,7 @@
 		     , #{mainFaxno}
 		     , #{homepageUrl}
 		     , #{distributionGb}
+		     , #{shotDelvYn}
 		     , #{supplyStat}
 		     , IFNULL(#{minOrdAmt},0)
 		     , IFNULL(#{delvFee},0)
@@ -156,6 +159,7 @@
 		     , MAIN_FAXNO = #{mainFaxno}
 		     , HOMEPAGE_URL = #{homepageUrl}
 		     , DISTRIBUTION_GB = #{distributionGb}
+		     , SHOT_DELV_YN = #{shotDelvYn}
 		     , SUPPLY_STAT = #{supplyStat}
 		     , MIN_ORD_AMT = IFNULL(#{minOrdAmt},0)
 		     , DELV_FEE = IFNULL(#{delvFee},0)

style24.admin/src/main/webapp/WEB-INF/views/business/SupplyCompanyForm.html

@@ -218,8 +218,8 @@
 						</td>
 						<th>전자계약여부<i class="required" title="필수"></i></th>
 						<td>
-							<label class="rdoBtn"><input type="radio" name="econtractYn" value="Y" checked="checked">Yes<span></span></label>
-							<label class="rdoBtn"><input type="radio" name="econtractYn" value="N">No<span></span></label>
+							<label class="rdoBtn"><input type="radio" name="econtractYn" value="Y" checked="checked"/>Yes<span></span></label>
+							<label class="rdoBtn"><input type="radio" name="econtractYn" value="N"/>No<span></span></label>
 						</td>
 						<th>정산일<i class="required" title="필수"></i></th>
 						<td>
@@ -243,9 +243,16 @@
 							<input type="text" name="depositorNm" maxlength="50"/>
 						</td>
 						<th>사용여부<i class="required" title="필수"></i></th>
+						<td>
+							<label class="rdoBtn"><input type="radio" name="useYn" value="Y" checked="checked"/>Yes<span></span></label>
+							<label class="rdoBtn"><input type="radio" name="useYn" value="N"/>No<span></span></label>
+						</td>
+					</tr>
+					<tr>
+						<th>총알배송여부<i class="required" title="필수"></i></th>
 						<td colspan="7">
-							<label class="rdoBtn"><input type="radio" name="useYn" value="Y" checked="checked">Yes<span></span></label>
-							<label class="rdoBtn"><input type="radio" name="useYn" value="N">No<span></span></label>
+							<label class="rdoBtn"><input type="radio" name="shotDelvYn" value="Y"/>Yes<span></span></label>
+							<label class="rdoBtn"><input type="radio" name="shotDelvYn" value="N" checked="checked"/>No<span></span></label>
 						</td>
 					</tr>
 					<tr>
@@ -294,6 +301,10 @@
 		},
 		{ headerName: "업종", field: "bizKind", width: 150, cellClass: 'text-center' },
 		{ headerName: "업태", field: "bizType", width: 150, cellClass: 'text-center' },
+		{
+			headerName: "총알배송여부", field: "shotDelvYn", width: 100, cellClass: 'text-center',
+			valueGetter: function (params) { return params.data.shotDelvYn == 'Y' ? 'Yes' : 'No'; }
+		},
 		{
 			headerName: "입점상태", field: "supplyStat", width: 100, cellClass: 'text-center',
 			valueGetter: function (params) {
@@ -408,6 +419,12 @@
 		} else {
 			$('#detailForm input:radio[name=useYn]').eq(1).trigger('click');
 		}
+		
+		if (event.data.shotDelvYn == 'Y') {
+			$('#detailForm input:radio[name=shotDelvYn]').eq(0).trigger('click');
+		} else {
+			$('#detailForm input:radio[name=shotDelvYn]').eq(1).trigger('click');
+		}
 	}
 
 	// 검색