فهرست منبع

대량 등록 로그 개발중

eskim 5 سال پیش
والد
کامیت
b953bd3a14

+ 2 - 2
style24.scm/src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -1205,7 +1205,7 @@ public class TssGoodsService {
 	private Goods createSelfGoodsInfo(GoodsMass goodsMass, String procJob) {
 
 		Goods goods = new Goods();
-		goods.setGoodsStat("40"); // 상품상태
+		goods.setGoodsStat("G008_40"); // 상품상태
 		goods.setGoodsRegMsg("승인대기");
 
 		// 품번정보 확인 (FRJ 는 11, 그외는 10)
@@ -1540,7 +1540,7 @@ public class TssGoodsService {
 			for (GoodsNotiInfo goodsNotiInfo : goodsNotiList) {
 				if ("Y".equals(goodsNotiInfo.getReqYn()) && StringUtils.isEmpty(goodsNotiInfo.getNiContent())) {
 					goods.setGoodsRegMsg("고시항목 오류");
-					goods.setGoodsStat("20");
+					goods.setGoodsStat("G008_20");
 					return goods;
 				}
 			}

+ 15 - 0
style24.scm/src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -779,6 +779,21 @@ public class TssGoodsController extends TssBaseController {
 		return mav;
 	}
 
+	/**
+	 * 상품 대량등록 결과 조회
+	 *
+	 * @param goodsSearch
+	 * @return
+	 * @author eskim
+	 * @since 2020. 01. 13
+	 */
+	@PostMapping("/reg/log/list")
+	@ResponseBody
+	public Collection<GoodsMass> getGoodsRegLogList(@RequestBody GoodsSearch goodsSearch) {
+		//return goodsService.getGoodsRegLogList(goodsSearch);
+		return null;
+	}
+
 	/**
 	 * 상품대량등록 엑셀 저장
 	 *

+ 3 - 41
style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -143,7 +143,7 @@
 		{headerName: "작업일시", field: "regDt", width: 150, cellClass: 'text-center'},
 		{headerName: "상품등록여부", field: "regSuccYn", width: 100, cellClass: 'text-center'},
 		{headerName: "등록결과메세지", field: "regFailRsn", width: 200, cellClass: 'text-left'},
-		{headerName: "등록브랜드코드", field: "brandCd", width: 120, cellClass: 'text-center'},
+		{headerName: "브랜드코드", field: "brandCd", width: 120, cellClass: 'text-center'},
 		{headerName: "업체코드", field: "supplyCompCd", width: 130, cellClass: 'text-center'},
 		{headerName: "상품코드", field: "goodsCd", width: 130, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 150, cellClass: 'text-left'},
@@ -151,27 +151,6 @@
 		{headerName: "검색어", field: "goodsSnm1", width: 150, cellClass: 'text-left'},
 		{headerName: "제조국", field: "makeNm", width: 100, cellClass: 'text-center'},
 		{headerName: "제조일", field: "makeYmd", width: 100, cellClass: 'text-center'},
-		{headerName: "이지미타입", field: "imgType", width: 100, cellClass: 'text-center'},
-		{headerName: "이미지경로1", field: "imgPath1", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로2", field: "imgPath2", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로3", field: "imgPath3", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로4", field: "imgPath4", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로5", field: "imgPath5", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로6", field: "imgPath6", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로7", field: "imgPath7", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로8", field: "imgPath8", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로9", field: "imgPath9", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로10", field: "imgPath10", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로11", field: "imgPath11", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로12", field: "imgPath12", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로13", field: "imgPath13", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로14", field: "imgPath14", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로15", field: "imgPath15", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로16", field: "imgPath16", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로17", field: "imgPath17", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로18", field: "imgPath18", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로19", field: "imgPath19", width: 200, cellClass: 'text-left'},
-		{headerName: "이미지경로20", field: "imgPath20", width: 200, cellClass: 'text-left'},
 		{headerName: "고시분류코드", field: "niClsfCd", width: 200, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(niClsfCdList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(niClsfCdList, params.value); },
@@ -205,7 +184,6 @@
 		{headerName: "고시내용26", field: "niContent26", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용27", field: "niContent27", width: 200, cellClass: 'text-left'},
 		{headerName: "고시내용28", field: "niContent28", width: 200, cellClass: 'text-left'},
-		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
 		{headerName: "품목", field: "itemkindCd", width: 100, cellClass: 'text-center'},
 		{headerName: "스타일연도", field: "styleYear", width: 100, cellClass: 'text-center'},
 		{headerName: "시즌", field: "seasonCd", width: 80, cellClass: 'text-center'},
@@ -233,30 +211,14 @@
 	
 	//자사상품대량등록 클릭시
 	$('#btnGoodsSelfCreate').on('click', function() {
-		cfnExcelUploadPopup('createSelfGoods', 'createSelfGoods');
+		cfnExcelUploadPopup('createGoods', 'createSelfGoods');
 	});
 	
-	var createSelfGoods = function(result){
-		var data = {procJob : result.procJob
-					,excelFileNm : result.excelFileNm
-					};
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/goods/mass/excelupload/create', jsonData, fnGoodsSelfCreateCallBack);
-	}
-	
-	var fnGoodsSelfCreateCallBack = function(result){
-		
-		var date = new Date();
-		$("#massForm input[name=stDate]").val(date.format("YYYY-MM-DD"));
-		$("#massForm input[name=edDate]").val(date.format("YYYY-MM-DD"));
-		fnGoodsListSearch();
-	}
-	
 	//입점상품대량등록 클릭시
 	$('#btnGoodsCreate').on('click', function() {
 		cfnExcelUploadPopup('createGoods', 'createGoods');
 	});
-	
+
 	var createGoods = function(result){
 		var data = {procJob : result.procJob
 					,excelFileNm : result.excelFileNm