딜상품 구성

style24.admin/src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -1321,6 +1321,7 @@ public class TsaGoodsService {
 		regGoods.setFormalGb("G009_10"); // 정상 기본값 처리
 		regGoods.setGoodsGb("G073_11"); // 자사상품은 신규
 		regGoods.setDistributionGb("G065_12"); // 유통구분
+		regGoods.setTaxGb("10"); // 과세구분
 		regGoods.setGoodsNum(goodsCd);
 
 		regGoods.setListPrice(goods.getCurrPrice());

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsDealForm.html

@@ -34,8 +34,7 @@
 								- 브랜드코드 : 구성상품의 기준여부 'Y'상품의 브랜드코드<br/>
 								- 품목코드 : 구성상품의 기준여부 'Y'상품의 품목코드<br/>
 								- 포인트 : 구성상품의 기준여부 'Y'상품의 브랜드 포인트<br/>
-								- 기본배송비 : 구성상품의 기준여부 'Y'상품의 브랜드 기본배송비<br/>
-								- 무료배송비기준 : 구성상품의 기준여부 'Y'상품의 브랜드 무료배송비기준<br/>
+								- 배송비정책 : 구성상품의 기준여부 'Y'상품의 브랜드 배송비정책<br/>
 							</span>
 						</div>
 						<!-- //아이콘 툴팁 --> 
@@ -46,23 +45,21 @@
 						<col width="10%"/>
 						<col/>
 						<col width="10%"/>
-						<col width="23%"/>
+						<col width="20%"/>
 						<col width="10%"/>
-						<col width="23%"/>
+						<col width="24%"/>
 					</colgroup>
 					<tr>
 						<th>상품명<em class="required" title="필수"></em></th>
 						<td><input type="text" id="goodsNm" name="goodsNm" maxlength="60"/></td>
 						<th>판매가<em class="required" title="필수"></em></th>
 						<td><input type="text" class="w100" id="currPrice" name="currPrice" maxlength="8" data-valid-type="numeric"/></td>
-						<th>자사노출여부<em class="required" title="필수"></em></th>
-						<td><label class="rdoBtn"><input type="radio" name="selfMallYn" id="selfMallYnY" value="Y" checked/>Y</label>
-							<label class="rdoBtn"><input type="radio" name="selfMallYn" id="selfMallYnN" value="N"/>N</label>
-						</td>
+						<th>제조년월일<em class="required" title="필수"></em></th>
+						<td><input type="text" class="w100" id="makeYmd" name="makeYmd" maxlength="8" data-valid-type="date"/></td>
 					</tr>
 					<tr>
 						<th>년도/시즌<em class="required" title="필수"></em></th>
-						<td colspan="3"><select  name="styleYear" id="styleYear">
+						<td><select  name="styleYear" id="styleYear">
 								<option value="">[전체]</option>
 								<option th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
@@ -77,8 +74,6 @@
 								<option th:if="${sexGbList}" th:each="oneData, status : ${sexGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-					</tr>
-					<tr>
 						<th>원산지<em class="required" title="필수"></em></th>
 						<td ><select name="makeOriginCd" id="makeOriginCd">
 								<option value="">[전체]</option>
@@ -86,8 +81,6 @@
 							</select>
 							<input type="hidden" id="makeNm" name="makeNm" />
 						</td>
-						<th>제조년월일<em class="required" title="필수"></em></th>
-						<td colspan="3"><input type="text" class="w100" id="makeYmd" name="makeYmd" maxlength="8" data-valid-type="date"/></td>
 					</tr>
 				</table>
 			</div>	
@@ -169,7 +162,7 @@
 	var gridGoodsDealOptions = gagaAgGrid.getGridOptions(columnGoodsDealDefs);
 	gridGoodsDealOptions.rowSelection = 'multiple';
 	gridGoodsDealOptions.suppressRowClickSelection = true;
-	gridGoodsSetOptions.stopEditingWhenGridLosesFocus = true;
+	gridGoodsSetOptions.stopEditingWhenGridLosesFocus = true;	//그리드 에디터 값 저장가능
 	
 	// 드래그
 	gridGoodsDealOptions.rowDragManaged = true;
@@ -341,16 +334,6 @@
 			return false;
 		}
 		
-		if (gagajf.isNull($("#goodsDealForm input[name=selfMallYn]").val())){
-			mcxDialog.alertC('자사노출여부를 선택해 주세요.', {
-				sureBtnText: "확인",
-				sureBtnClick: function() {
-					$("#goodsDealForm input[name=selfMallYn]").focus();
-				}
-			});	
-			return false;
-		}
-		
 		if(gagajf.isNull($("#goodsDealForm select[name=styleYear]").val())){
 			mcxDialog.alertC('년도을 선택해 주세요.', {
 				sureBtnText: "확인",

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsSetForm.html

@@ -161,7 +161,7 @@
 	var gridGoodsSetOptions = gagaAgGrid.getGridOptions(columnGoodsSetDefs);
 	gridGoodsSetOptions.rowSelection = 'multiple';
 	gridGoodsSetOptions.suppressRowClickSelection = true;
-	gridGoodsSetOptions.stopEditingWhenGridLosesFocus = true;
+	gridGoodsSetOptions.stopEditingWhenGridLosesFocus = true;	//그리드 에디터 값 저장가능
 	
 	// 드래그
 	gridGoodsSetOptions.rowDragManaged = true;