납품서 팝업 수정

src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -15,10 +15,10 @@
 							<div class="col-xs-12">
 								<form id="ITP_FORM_ORDMNG03010_SEARCH" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
-									
+								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_ORDMNG03010_SERVICE_" class="form-control itp_input" name="">
+											<select id="ITP_FORM_ORDMNG03010_SERVICE_DLV_DT" class="form-control itp_input" name="">
 												<option value="A">납품일자 *</option>											
 											</select>
 										</div>										
@@ -30,14 +30,15 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_in itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="납품장소(매장/창고)" />
+											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소(매장/창고)" />
+											<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" />
 										</div>
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
-											<button type="button" id="ITP_BTN_ORDMNG03010_PO_POPUP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_ORDMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호 /품목명" />
+											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
 										</div>
 									</div>
 								</form>

src/main/webapp/app/popup/biz/BIZPOP_DLV_STTMT_PRN.html

@@ -51,7 +51,6 @@
 										<label style="width:100px;">납품담당</label>
 										<label>:</label>
 										<span class="fnDlvMgrNm"></span>
-										<span class="fnDlvMgrTelNo"></span>
 									</div>
 								</div>
 								<div class="col-xs-6">
@@ -65,7 +64,7 @@
 										<div class="itp_sign_header">
 											<label>납품확인일</label>
 										</div>
-										<div class="itp_sign_area fnDlvCnfmDt"></div>
+										<div class="itp_sign_area"></div>
 									</div>
 								</div>
 							</div>	
@@ -74,14 +73,12 @@
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										<span style="margin:0px; " class="fnZipNo"></span>
-										<span class="fnLoadAddr"></span>
-										<span class="fnDtlAddr"></span>
+										<span style="margin:0px; " class="fnDlvAddr"></span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>
 										<label>:</label>
-										<span class="fnVndrTelNo"></span>
+										<span class="fnWhsMgrTelNo"></span>
 									</div>
 								</div>
 							</div>	
@@ -93,25 +90,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBsnsRegNo"></div>
+											<div class="col-xs-12 itp_in fnDlvBsnsRegno"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnSpplyNm"></div>
+											<div class="col-xs-12 itp_in fnDlvNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnDlvOwnerNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnDlvAddr"></div>
 										</div>
 									</div>
 								</div>	
@@ -124,25 +121,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnPoBsnsRegno"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnPoNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnDlvSttmtUnqNo"></div>
+											<div class="col-xs-12 itp_in fnPoOwnerNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnPoAddr"></div>
 										</div>
 									</div>
 								</div>	

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -29,7 +29,7 @@ let ITP_FORM_ORDMNG03010_DETAIL_IS_WRITING = false;
 
 /*API URL*/
 let API_DELI_GRID_LIST 	= '/api/pomng/inoutmng/spply-deli-grid-list';// 목록
-let API_INFO_INV 		= '/api/pomng/inoutmng/info-inv';	// 상세
+let API_INFO_INV 		= '/api/pomng/inoutmng/init-spply-inv';	// 상세
 let API_SAVE_SPPLY_INV 	= '/api/pomng/inoutmng/save-spply-inv';// 저장
 let API_ITEM_CLASS_LEVEL= '/api/item/class-level-list';		//품목분류 level 검색
 
@@ -37,10 +37,16 @@ let API_ITEM_CLASS_LEVEL= '/api/item/class-level-list';		//품목분류 level
 const gridColModel = {
 	list: [
 	
+			{
+				index: 'Brand_ID', name: 'brandId',
+				label: ITP_MSG_LOCALE.label.brandId, //브랜드
+				width: '18', fixed: false, align: 'center',
+				sortable: false, hidden: true
+			},
 			{
 				index: 'Brand_Nm', name: 'brandNm',
 				label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-				width: '10', fixed: false, align: 'center',
+				width: '20', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -51,25 +57,31 @@ const gridColModel = {
 			},
 			{
 				index: 'ITEM_ST_CD', name: 'dlvStCd',
-				label: ITP_MSG_LOCALE.label.dlvStCd, //납품서상태
-				width: '6', fixed: false, align: 'center',
+				label: '납품상태', //납품서상태
+				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'poBsnsRegno', name: 'podrRegDt',
-				label: ITP_MSG_LOCALE.label.podrRegDt, //수주일자
-				width: '10', fixed: false, align: 'center',
+				index: 'PODR_REG_DT', name: 'podrRegDt',
+				label: '수주일자', //수주일자
+				width: '14', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'PCH_ITEM_YN', name: 'dlvReqDt',
 				label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
-				width: '10', fixed: false, align: 'center',
+				width: '14', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'PCH_ITEM_YN', name: 'dlvSchDt',
 				label: ITP_MSG_LOCALE.label.dlvSchDt, //납품예정일
+				width: '14', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'PCH_ITEM_YN', name: 'dlvCmpltDt',
+				label: ITP_MSG_LOCALE.label.dlvCmpltDt, //납품완료일
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
@@ -86,7 +98,7 @@ const gridColModel = {
 				sortable: false, hidden: false
 			},
 			{
-				index: 'UNIT', name: 'podrQty',
+				index: 'PODR_QTY', name: 'podrQty',
 				label: ITP_MSG_LOCALE.label.podrQty, //수주수량
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
@@ -97,12 +109,24 @@ const gridColModel = {
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
+			{
+				index: 'UNIT', name: 'unit',
+				label: ITP_MSG_LOCALE.label.unit, //납품수량
+				width: '6', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
 			{
 				index: 'PCH_ITEM_YN', name: 'unitAmt',
 				label: ITP_MSG_LOCALE.label.unitAmt, //납품금액
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
+			{
+				index: 'SALE_ITEM_YN', name: 'whsNm',
+				label: ITP_MSG_LOCALE.label.whsNm, //납품장소
+				width: '6', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
 			{
 				index: 'PCH_ITEM_YN', name: 'dlvMgrNm',
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, //납품담당자
@@ -158,6 +182,7 @@ let pageObj = {
 			this.ui.init();
 			this.event.init();
 			this.fileUpload();
+			this.action();
 	},
 	ui: {
 			init: function () {
@@ -186,6 +211,62 @@ let pageObj = {
 			ready: function() {
 					listObj.init();
 			}
+	},
+	action: function () {
+		var _this = this;
+		// 검색 납품장소
+		$('#ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM').on('click', function() {
+			_this.popup('SW');
+		});
+		// 검색 납품장소 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM').on('click', function() {
+			$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM').val('');
+			$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID').val('');
+			
+		});
+	},
+	popup: function (arg) {
+		var popFn ;
+		// 팝업
+		if (arg == "SW") {
+			popFn = this.callback.searWhs;
+		} 
+		
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		if (arg == "SW" ) {
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		} 
+		
+		
+	},
+	callback: {
+		searWhs: function(rowDataPop) {
+			if(rowDataPop) {
+				$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
+			}
+			
+		},
+		searNWhs: function(rowDataPop) {
+			if(rowDataPop) {
+				$('#ITP_FORM_ORDMNG03010_NDETAIL_WHS_NM').val(rowDataPop.whsNm + " - " + rowDataPop.locationNm);
+				$('#ITP_FORM_ORDMNG03010_NDETAIL_WHS_ID').val(rowDataPop.whsId);
+				$('#ITP_FORM_ORDMNG03010_NDETAIL_LOCATION').val(rowDataPop.location);
+			}
+		},
+		poRej: function(rowDataPop) {
+			if(rowDataPop) {
+				console.log(rowDataPop);
+				
+				if (rowDataPop.retVal == "Y") {
+				  modifyObj.button.rejectSave(rowDataPop);
+				}
+				
+				
+			}
+		}
+		
+		
 	},
 	event: {
 			init: function () {
@@ -239,7 +320,8 @@ let pageObj = {
 			});
 			if(mode == 'LIST') { // 목록
 				$('#ITP_FORM_ORDMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('userId'));
-					$('#ITP_AJAX_ORDMNG03010_LIST_CONTAINER').show();
+				$('#ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));					$('#ITP_AJAX_ORDMNG03010_LIST_CONTAINER').show();
+					$('#ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM').show();
 					fn_show_btn_auth_array(['#ITP_BTN_ORDMNG03010_SRH', '#ITP_BTN_ORDMNG03010_POPUP']);
 			} else if(mode == 'ADD') { // 등록
 					$('#ITP_AJAX_ORDMNG03010_DETAIL_CONTAINER').show();

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_STTMT_PRN.js

@@ -6,8 +6,8 @@ require(['config'], function() {
 	});
 });
 
-let FRCOMP_POP_GRID_LIST = '/api/pomng/inoutmng/spply-deli-grid-list';
-let FRCOMP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
+let ITP_POP_GRID_LIST = '/api/pomng/inoutmng/info-inv';
+let ITP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
 function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
@@ -23,19 +23,34 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 			this.load(param);
 		},
 		load: function(param) {
-			fn_ajax_call(FRCOMP_POP_INFO_INV, param, this.callback, 'GET');
+			fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'GET');
 		},
 		callback: function (result) {
 			console.log(result);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(args.dlvSttmtUnqNo);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(args.dlvRegDt);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrTelNo').text(args.dlvMgrTelNo);
-			var divMgrTelNo = "(" + args.divMgrTelNo + ")";
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
+			
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
+			
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvNm').text(result.dlvNm);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvOwnerNm').text(result.dlvOwnerNm);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+			
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoBsnsRegno').text(result.poBsnsRegno);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
+
 			
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnZipNo').val(args.zipNo);
-			var zipNo = "(" + args.zipNo + ")";
 		},	
 	};
+//	var infoParam = {'brandId':fn_make_user_info.get('brandId'), 'dlvSttmtUnqNo': args.dlvSttmtUnqNo};
+	var infoParam = {'brandId':fn_make_user_info.get('brandId'), 'dlvSttmtUnqNo': '2211020000002001'};
+	console.log(infoParam);
+	viewObj.init(infoParam);
 	
 	
 	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -108,11 +123,11 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 			{
 				index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 				label: '발주번호', //
-				width: '5', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'AFFL_SHOP_NM', name: 'itemId',
+				index: 'ITEM_ID', name: 'itemId',
 				label: '품목번호', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
@@ -126,13 +141,13 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 			{
 				index: 'PODR_QTY', name: 'podrQty',
 				label: '발주수량', //
-				width: '10', fixed: false, align: 'center',
+				width: '5', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'DLV_QTY', name: 'dlvQty',
 				label: '납품서수량', //
-				width: '10', fixed: false, align: 'center',
+				width: '5', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -146,12 +161,13 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 		    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
 		},
 		postData: JSON.stringify(param),
-		url: DOMAIN + FRCOMP_POP_GRID_LIST,
+		url: DOMAIN + ITP_POP_GRID_LIST,
 		pager: THIS_GIRD_PAGER,
 		multiselect: true,
 		loadComplete: function(data) {
-			console.log(data);
-			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_DLV_STTMT_PRN', itp_BIZPOP_DLV_STTMT_PRN_search, itp_fn_BIZPOP_DLV_STTMT_PRN_empty, true, data.gridRecords, false);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
+					//여기에 데이터
+			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_DLV_STTMT_PRN', itp_BIZPOP_DLV_STTMT_PRN_search, itp_fn_BIZPOP_DLV_STTMT_PRN_empty, true, data.invPoInfoList, false);
 	    },
 	    loadError: function(jqXHR, textStatus, errorThrown) {
 	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);