상품상세 출고처 노출, 세트/딜상품 생성시 출고처 처리

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

@@ -1372,6 +1372,7 @@ public class TsaGoodsService {
 		regGoods.setGoodsGb("G073_11"); // 자사상품은 신규
 		//regGoods.setDistributionGb("G065_12"); // 유통구분
 		regGoods.setTaxGb("10"); // 과세구분
+		regGoods.setTobeFormYn("Y"); 
 		regGoods.setGoodsNum(goodsCd);
 
 		Collection<GoodsCompose> goodsComposeList = null;
@@ -1402,12 +1403,13 @@ public class TsaGoodsService {
 				regGoods.setSupplyCompCd(extendGoods.getSupplyCompCd());
 				regGoods.setFormalGb(extendGoods.getFormalGb());
 				regGoods.setSelfGoodsYn(extendGoods.getSelfGoodsYn());
+				regGoods.setDelvLocCd(extendGoods.getDelvLocCd()); //출고처
 			}
 
 			if ("Y".equals(goodsCompose.getRepYn())) {
 				regGoods.setListPrice(extendGoods.getCurrPrice());
 				regGoods.setCurrPrice(extendGoods.getCurrPrice());
-				regGoods.setDcRate((int)(this.getDcRate(goods.getCurrPrice(), goods.getCurrPrice())));
+				regGoods.setDcRate((int)(this.getDcRate(regGoods.getListPrice(), regGoods.getCurrPrice())));
 			}
 		}
 
@@ -1451,6 +1453,7 @@ public class TsaGoodsService {
 		regGoods.setGoodsGb("G073_11"); // 자사상품은 신규
 		//regGoods.setDistributionGb("G065_12"); // 유통구분
 		regGoods.setTaxGb("10"); // 과세구분
+		regGoods.setTobeFormYn("Y"); 
 		regGoods.setGoodsNum(goodsCd);
 
 		Collection<GoodsCompose> goodsComposeList = null;
@@ -1485,6 +1488,7 @@ public class TsaGoodsService {
 				regGoods.setSupplyCompCd(extendGoods.getSupplyCompCd());
 				regGoods.setFormalGb(extendGoods.getFormalGb());
 				regGoods.setSelfGoodsYn(extendGoods.getSelfGoodsYn());
+				regGoods.setDelvLocCd(extendGoods.getDelvLocCd()); //출고처
 			}
 		}
 

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

@@ -50,6 +50,7 @@ public class Goods extends TscBaseDomain {
 	private String supplyCompCd;		//공급업체코드
 	private String supplyGoodsCd;		//공급업체상품코드(원코드)
 	private String ageGrpCd;		//상품연령대(공통코드 G023)
+	private String delvLocCd;		//출고처코드
 	private String delvFeeCd;	//배송비정책코드
 	private int delvFee;		//배송비
 	private int minOrdAmt;		//무료배송비최소구매금액

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

@@ -457,6 +457,7 @@
 		              , G.RETURNABLE_YN
 		              , G.NEW_CUST_ORD_YN
 		              , G.GIFT_PACK_YN
+		              , G.DELV_LOC_CD
 		              , G.DELV_FEE_CD
 		              , G.MAIN_COLOR_CD
 		              , DATE_FORMAT(G.FRST_CFRM_DT, '%Y%m%d%H%i%S') AS FRST_CFRM_DT
@@ -945,6 +946,7 @@
 		     , G.SUPPLY_COMP_CD
 		     , G.SUPPLY_GOODS_CD
 		     , G.AGE_GRP_CD
+		     , G.DELV_LOC_CD
 		     , G.DELV_FEE_CD
 		     , D.DELV_FEE
 		     , D.MIN_ORD_AMT
@@ -1126,6 +1128,7 @@
 		      , SUPPLY_COMP_CD
 		      , SUPPLY_GOODS_CD
 		      , AGE_GRP_CD
+		      , DELV_LOC_CD
 		      , DELV_FEE_CD
 		      , PNT_PRATE
 		      , PNT_MRATE
@@ -1187,6 +1190,7 @@
 		     , SUPPLY_COMP_CD      
 		     , SUPPLY_GOODS_CD     
 		     , AGE_GRP_CD          
+		     , DELV_LOC_CD
 		     , DELV_FEE_CD            
 		     , PNT_PRATE           
 		     , PNT_MRATE           
@@ -1617,6 +1621,7 @@
 		  , SUPPLY_COMP_CD
 		  , SUPPLY_GOODS_CD
 		  , AGE_GRP_CD
+		  , DELV_LOC_CD
 		  , DELV_FEE_CD
 		  , PNT_PRATE
 		  , PNT_MRATE
@@ -1662,6 +1667,7 @@
 		  , #{supplyCompCd}
 		  , #{supplyGoodsCd}
 		  , #{ageGrpCd}
+		  , #{delvLocCd}
 		  , #{delvFeeCd}
 		  , #{pntPrate}
 		  , #{pntMrate}
@@ -1721,6 +1727,7 @@
 		  , FOREIGN_BUY_YN = #{foreignBuyYn}
 		  , PARALLEL_IMPORT_YN = #{parallelImportYn}
 		  , ORDER_MADE_YN = #{orderMadeYn}
+		  , DELV_LOC_CD = #{delvLocCd}
 		  , DELV_FEE_CD = #{delvFeeCd}
 		  , PNT_PRATE = #{pntPrate}
 		  , PNT_MRATE = #{pntMrate}

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

@@ -154,6 +154,8 @@
 			valueParser: function (params) { return gagaAgGrid.lookupKey(goodsStatList, params.newValue); }
 		},
 		{headerName: "수량", field: "qty" , width: 80, cellClass: 'text-right',hide:true}
+		,
+		{headerName: "출고처", field: "delvLocCd" , width: 80, cellClass: 'text-right',hide:true}
 	];
 
 	// Get GridOptions
@@ -278,6 +280,7 @@
 						, currPrice : goods.currPrice
 						, selfGoodsYn : goods.selfGoodsYn
 						, sysImgNm : goods.sysImgNm
+						, delvLocCd : goods.delvLocCd
 						};
 				//그리드 마지막에 추가해야함
 				gridGoodsDealOptions.api.updateRowData({add: [data], addIndex: idx});

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -275,9 +275,11 @@
 											<button type="button" class="btn btn-success btn-lg" id="btnGoodsItemkindChange">품목변경</button>
 											</th:block>
 										</td>
-										<th>원가</th>
-										<td><input type="text" class="w80p aR" id="costPrice" name="costPrice" maxlength="10" data-valid-type="numeric"/> 원
-											<input type="hidden" id="costPriceOrg" name="costPriceOrg"/>
+										<th>출고처<em class="required" title="필수"></em></th>
+										<td>
+											<select name="delvLocCd"  id="delvLocCd">
+											</select>
+											<input type="hidden" id="delvLocCdOrg" name="delvLocCdOrg"/>
 										</td>
 									</tr>
 									<tr>
@@ -388,6 +390,10 @@
 											</select>
 											<input name="sellEddt" id="sellEddt" type="hidden" />
 										</td>
+										<th>원가</th>
+										<td><input type="text" class="w80p aR" id="costPrice" name="costPrice" maxlength="10" data-valid-type="numeric"/> 원
+											<input type="hidden" id="costPriceOrg" name="costPriceOrg"/>
+										</td>
 									</tr>
 									</tbody>
 								</table>
@@ -1073,6 +1079,8 @@
 			
 			cfnCreateCombo('/renderer/delvFee/list/' + result.supplyCompCd, $('#goodsDetailForm select[name=delvFeeCd]'), "[선택]", result.delvFeeCd);
 			$('#goodsDetailForm input[name=delvFeeCdOrg]').val(result.delvFeeCd);
+			cfnCreateCombo('/renderer/delvloc/list/' + result.supplyCompCd, $('#goodsDetailForm select[name=delvLocCd]'), "[선택]", result.delvLocCd);
+			$('#goodsDetailForm input[name=delvLocdOrg]').val(result.delvLocCd);
 			
 		//	$('#goodsDetailForm input[name=certNum]').val(result.certNum);
 		//	$('#goodsDetailForm input[name=certNumOrg]').val(result.certNum);
@@ -1526,6 +1534,14 @@
 				});
 			}
 			
+			// 상품상세 - 입점
+			if ("N" == $("#goodsDetailForm input[name=selfGoodsYn]").val() && $("#goodsDetailForm input[name=goodsType]").val() == "G056_N"){ 
+				if (gagajf.isNull($("#goodsDetailForm textarea[name=goodsDesc]").val()) || "<p><br></p>" == $("#goodsDetailForm textarea[name=goodsDesc]").val() ){
+					mcxDialog.alert("상품상세정보탭의 상품상세내용을 입력해주세요.");
+					return false;
+				}
+			}
+			
 			// 자사일 경우 대표색상 선택 여부
 			if ("Y" == $('#goodsDetailForm input[name=selfGoodsYn]').val()){
 				
@@ -1661,6 +1677,17 @@
 			return false;
 		}
 		
+		// 출고처
+		if(gagajf.isNull($("#goodsDetailForm select[name=delvLocCd]").val())){
+			mcxDialog.alertC("출고처를 선택해 주세요.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$("#goodsDetailForm select[name=delvLocCd]").focus();
+				}
+			});
+			return;
+		}
+		
 		// 배송비구분
 		if(gagajf.isNull($("#goodsDetailForm select[name=delvFeeCd]").val())){
 			mcxDialog.alertC("배송비정책을 선택해 주세요.", {
@@ -1671,6 +1698,7 @@
 			});
 			return;
 		}
+		
 		// 포인트
 		if ( gagajf.isNull($("#goodsDetailForm input[name=pntPrate]").val())) {
 			mcxDialog.alertC("PC 포인트를 입력해 주세요.", {
@@ -1804,7 +1832,7 @@
 			});	
 			return false;
 		}
-
+		
 		idx = 0;
 
 		//재고 옵션 관련 확인
@@ -2271,6 +2299,10 @@
 		if ($("#goodsDetailForm input[name=delvFeeCdOrg]").val() != $("#goodsDetailForm select[name=delvFeeCd]").val()){
 			return true;
 		}
+		// 출고처
+		if ($("#goodsDetailForm input[name=delvLocCdOrg]").val() != $("#goodsDetailForm select[name=delvLocCd]").val()){
+			return true;
+		}
 		// 교환가능여부
 		if ($("#goodsDetailForm input[name=changeableYnOrg]").val() != $("#goodsDetailForm input[name=changeableYn]:checked").val()){
 			return true;

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

@@ -156,6 +156,8 @@
 			valueParser: function (params) { return gagaAgGrid.lookupKey(goodsStatList, params.newValue); }
 		},
 		{headerName: "업체", field: "supplyCompCd" , width: 80, cellClass: 'text-right',hide: true}
+		,
+		{headerName: "출고처", field: "delvLocCd" , width: 80, cellClass: 'text-right',hide:true}
 		
 	];
 
@@ -282,6 +284,7 @@
 						, selfGoodsYn : goods.selfGoodsYn
 						, supplyCompCd : goods.supplyCompCd
 						, sysImgNm : goods.sysImgNm
+						, delvLocCd : goods.delvLocCd
 						};
 				setGoodsCurrPrice += Number(goods.currPrice);
 				//그리드 마지막에 추가해야함