Merge branch 'eskim' into develop

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

@@ -965,7 +965,7 @@ public class TssGoodsController extends TssBaseController {
 				if (goodsInfo == null || goodsInfo.getGoodsCd().isEmpty()) {
 					deleteErrorFileList(errorFileList);
 					deleteErrorFileList(errorFileDextList);
-					throw new IllegalStateException(goodsImg.getSysImgNm() + " 의" + comGoodsCd + " 상품코드가  존재하지 않습니다.");
+					throw new IllegalStateException(goodsImg.getSysImgNm() + " 의" + comGoodsCd + " 상품코드가 존재하지 않습니다.");
 				}
 
 				//촬영업체
@@ -973,13 +973,20 @@ public class TssGoodsController extends TssBaseController {
 					if (!"Y".equals(goodsInfo.getSelfGoodsYn())) {
 						deleteErrorFileList(errorFileList);
 						deleteErrorFileList(errorFileDextList);
-						throw new IllegalStateException(goodsImg.getSysImgNm() + " 의" + comGoodsCd + " 상품코드를 확인해주세요.(자사상품만 등록 가능)");
+						throw new IllegalStateException(goodsImg.getSysImgNm() + " 의 " + comGoodsCd + " 상품코드를 확인해주세요.(자사상품만 등록 가능)");
 					}
 				} else {
 					if (!"N".equals(goodsInfo.getSelfGoodsYn())) {
 						deleteErrorFileList(errorFileList);
 						deleteErrorFileList(errorFileDextList);
-						throw new IllegalStateException(goodsImg.getSysImgNm() + " 의" + comGoodsCd + " 상품코드를 확인해주세요.(입점상품만 등록 가능)");
+						throw new IllegalStateException(goodsImg.getSysImgNm() + " 의 " + comGoodsCd + " 상품코드를 확인해주세요.(입점상품만 등록 가능)");
+					}
+					
+					// 같은 업체여부 확인
+					if (!TssSession.getInfo().getSupplyCompCd().equals(goodsInfo.getSupplyCompCd())) {
+						deleteErrorFileList(errorFileList);
+						deleteErrorFileList(errorFileDextList);
+						throw new IllegalStateException(goodsImg.getSysImgNm() + " 의 " + comGoodsCd + " 상품 업체코드를 확인해주세요.(같은 업체 상품만 등록 가능)");
 					}
 				}
 

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

@@ -8,7 +8,7 @@
 
     var gAuthkey = '';
     if (location.host.indexOf("ld") > -1) {
-    	gAuthkey = "PMW65Dgn2LQ6/YyYHJJsrHHLJyX+UndGTiJsAHrw6Wwo8n30YXfDQTTp9j91uc+f2I9Zy9UVYQS6cYnlo41Olo2aK80HoG7c8SC9S5ecnFfnUBj0g45T2jZiKiUf/+crqNgixpI4zxSFHBX1y1dPS8iEj24qDRFvtaP2mtHZYg8=";
+    	gAuthkey = "tyFoosxN8Rt/CW4EKATPCZMNr+d5OnbGvMGLLJTWg1FbooLYhxd/9A3zmxnMRX1yFRzCxOB0cbJ+Sr6Nld0fgmt3HKza2pkk5H9lpTGAhGJoRHyjfv4AOkiX9/OgIwD1n0jwxi9oPYdsG/sEmUJWJz/j+HW+7CL4Bc5msvmCdAU=";
     } else if (location.host.indexOf("lp") > -1) {
     	gAuthkey = "hr0AqviRLOCsbiIneYWPXdkhMn8awpDYw6HPDAvYo/cKKYVOyyuonGO2qFLlmur6svsAV6tkMZY5N1Iygq42R74h7AFlzk8xhM9YzIP8ySVhEN2LFlRxgsm/GQyLrzNoS1BwcHSYyOvAfzBCAVu6f8ubLw68bOFWivcvJKAz91I=";
     } else if (location.host.indexOf("td") > -1) {