Explorar el Código

수거서현황 진행

yhl88 hace 2 años
padre
commit
bd763b6c76

+ 11 - 13
src/main/webapp/app/collmng/COLLMNG03010.html

@@ -5,12 +5,9 @@
5 5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>수거서현황-팝업있음</strong></h2>
6 6
 				<div class="pull-right itp_cicon">
7 7
 					<button type="button" id="ITP_BTN_COLLMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8
-					<button type="button" id="ITP_BTN_COLLMNG03010_NEWREG" class="btn btn-primary btn-sm CUDP" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거서출력&nbsp;&nbsp;</button>
8
+					<button type="button" id="ITP_BTN_COLLMNG03010_PRINT" class="btn btn-primary btn-sm CUDP" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거서출력&nbsp;&nbsp;</button>
9 9
 				</div>
10 10
 				<div style="top:0px; text-align:center; font-size:20px;">
11
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
12
-					<button type="button" id="ITP_BTN_COLLMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
13
-					<button type="button" id="ITP_BTN_COLLMNG03010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
14 11
 				</div>
15 12
 			</div>
16 13
 			<div class="itp_det_in">
@@ -19,28 +16,29 @@
19 16
 						<div class="itp_srh_border fix">
20 17
 							<div class="col-xs-12">
21 18
 								<form id="ITP_FORM_COLLMNG03010_SEARCH" class="form-horizontal">
19
+								<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
20
+								<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
22 21
 									<div class="form-group">
23 22
 										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<select id="ITP_FORM_COLLMNG03010_SERVICE_COL_DT" class="form-control itp_input" name="servicecolDt">
25
-												<option value="A">수거일자 *</option>											
26
-											</select>
23
+ 											<label>수거일자 *</label>
27 24
 										</div>										
28 25
 										<div class="col-xs-3 itp_ip itp_noMar">
29 26
 											<div class="input-daterange input-group date">
30
-												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_COL_REQ_DT" class="form-control itp_input" name="colReqDt" value="">
27
+												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
31 28
 												<span class="input-group-addon itp_date_to">~</span>
32
-												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_COL_DT" class="form-control itp_input" name="colDt" value="">
29
+												<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
33 30
 											</div>
34 31
 										</div>
35 32
 										<div class="col-xs-2 itp_in itp_noMar">
36
-											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_COL_PLACE" class="form-control itp_input" name="sColPlace" placeholder="수거장소(매장/창고)" />
33
+											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="수거장소(매장/창고)" />
34
+											<input type="hidden" id="ITP_FORM_COLLMNG03010_SEARCH_WHS_ID" class="form-control itp_input" />
37 35
 										</div>
38 36
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
39
-											<button type="button" id="ITP_BTN_COLLMNG03010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
40
-											<button type="button" id="ITP_BTN_COLLMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
37
+											<button type="button" id="ITP_BTN_COLLMNG03010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
38
+											<button type="button" id="ITP_BTN_COLLMNG03010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
41 39
 						                </div>
42 40
 										<div class="col-xs-4 itp_ip itp_noMar">
43
-											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호 /품목명" />
41
+											<input type="text" id="ITP_FORM_COLLMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
44 42
 										</div>
45 43
 									</div>
46 44
 								</form>

+ 1 - 1
src/main/webapp/app/inoutmng/INOUTMNG02010.html

@@ -27,7 +27,7 @@
27 27
 											</div>
28 28
 										</div>
29 29
 										<div class="col-xs-2 itp_ip itp_noMar">
30
-											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" />
30
+											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" readonly/>
31 31
 											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
32 32
 										</div>
33 33
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">

+ 159 - 0
src/main/webapp/app/popup/biz/BIZPOP_COL_STTMT_PRN.html

@@ -0,0 +1,159 @@
1
+<div id="ITP_BIZPOP_COL_PICK_PRN" class="modal itp_modal">
2
+	<div class="modal-dialog" style="width:1200px;">
3
+		<div class="modal-content">
4
+			<form id="ITP_FORM_BIZPOP_COL_PICK_PRN">
5
+				<!-- <input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_FORM_DT" name="fromDt" value="">
6
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_TO_DT" name="toDt" value="">
7
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID" name="sbrandId" value="">
8
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_SPPLY_ID" name="sspplyId" value=""> -->
9
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID" name="brandId" value="">
10
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO" name="colPickUnqNo" value="">
11
+				<div id="ITP_POPUP_CONTAINER">
12
+					<div class="modal-header">
13
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
14
+						<h5 class="modal-title">가맹점 검색</h5>
15
+					</div>
16
+					<div id="ITP_BIZPOP_COL_PICK_PRN_PRINT_AREA" class="modal-body">
17
+						<div class="itp_form fix">
18
+							<div class="col-xs-12 itp_form_inline">
19
+								<div class="form-horizontal fix">
20
+									<div class="pull-right itp_cicon">
21
+										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_COL_PICK_PRN_BTN_PRINT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
22
+									</div>
23
+								</div>
24
+							</div>
25
+							<div class="col-xs-12 itp_form_inline">
26
+								<div class="col-xs-5"></div>
27
+								<div class="itp_title">
28
+									<label>수거확인서</label>
29
+								</div>
30
+							</div>	
31
+							<div class="col-xs-12 itp_form_inline">
32
+								<div class="col-xs-6" >
33
+									<div>
34
+										<label style="width:100px;">발행일</label>
35
+										<label>:</label>
36
+										<span class="fnColRegDt"></span>
37
+									</div>
38
+									<div>
39
+										<label style="width:100px;">수거확인번호</label>
40
+										<label>:</label>
41
+										<span class="fnColPickUnqNo"></span>
42
+									</div>
43
+									<div>
44
+										<label style="width:100px;">수거예정일</label>
45
+										<label>:</label>
46
+										<span class="fnColSchDt"></span>
47
+									</div>
48
+									<div>
49
+										<label style="width:100px;">수거담당</label>
50
+										<label>:</label>
51
+										<span class="fnPickMgrNm"></span>
52
+									</div>
53
+								</div>
54
+								<div class="col-xs-6">
55
+									<div class="itp_sign">
56
+										<div class="itp_sign_header">
57
+											<label>서    명</label>
58
+										</div>
59
+										<div class="itp_sign_area"></div>
60
+									</div>
61
+									<div class="itp_sign">
62
+										<div class="itp_sign_header">
63
+											<label>수거확인일</label>
64
+										</div>
65
+										<div class="itp_sign_area"></div>
66
+									</div>
67
+								</div>
68
+							</div>	
69
+							<div class="col-xs-12 itp_form_inline">
70
+								<div class="col-xs-6">
71
+									<div>
72
+										<label style="width:100px;">수거매장/창고</label>
73
+										<label>:</label>
74
+										<span style="margin:0px; " class="fnWhsAddr"></span>
75
+									</div>
76
+									<div>
77
+										<label style="width:100px;">전화번호</label>
78
+										<label>:</label>
79
+										<span class="fnPndrTelNo"></span>
80
+									</div>
81
+								</div>
82
+							</div>	
83
+							<div class="col-xs-6 itp_form_inline">
84
+								<div class="itp_form_info">
85
+										<div class="itp_company_type">
86
+											<label>반품처</label>
87
+										</div>
88
+									<div class="col-xs-11" style="padding:0; width:90%;">
89
+										<label class="col-xs-4">등록번호</label>
90
+										<div class="col-xs-8 itp_form_it">
91
+											<div class="col-xs-12 itp_in fnDlvBsnsRegno"></div>
92
+										</div>
93
+									</div>	
94
+									<div class="col-xs-11" style="padding:0; width:90%;">
95
+										<label class="col-xs-2">상호</label>
96
+										<div class="col-xs-8 itp_form_it">
97
+											<div class="col-xs-12 itp_in fnDlvNm"></div>
98
+										</div>
99
+									</div>
100
+									<div class="col-xs-11" style="padding:0; width:90%;">
101
+										<label class="col-xs-2">성명</label>
102
+										<div class="col-xs-8 itp_form_it">
103
+											<div class="col-xs-12 itp_in fnDlvOwnerNm"></div>
104
+										</div>
105
+									</div>
106
+									<div class="col-xs-11" style="padding:0; width:90%;">
107
+										<label class="col-xs-2">주소</label>
108
+										<div class="col-xs-8 itp_form_it">
109
+											<div class="col-xs-12 itp_in fnDlvAddr"></div>
110
+										</div>
111
+									</div>
112
+								</div>	
113
+							</div>
114
+							<div class="col-xs-6 itp_form_inline">
115
+								<div class="itp_form_info">
116
+										<div class="itp_company_type">
117
+											<label>수거처</label>
118
+										</div>
119
+									<div class="col-xs-11" style="padding:0; width:90%;">
120
+										<label class="col-xs-4">등록번호</label>
121
+										<div class="col-xs-8 itp_form_it">
122
+											<div class="col-xs-12 itp_in fnPoBsnsRegno"></div>
123
+										</div>
124
+									</div>	
125
+									<div class="col-xs-11" style="padding:0; width:90%;">
126
+										<label class="col-xs-2">상호</label>
127
+										<div class="col-xs-8 itp_form_it">
128
+											<div class="col-xs-12 itp_in fnPoNm"></div>
129
+										</div>
130
+									</div>
131
+									<div class="col-xs-11" style="padding:0; width:90%;">
132
+										<label class="col-xs-2">성명</label>
133
+										<div class="col-xs-8 itp_form_it">
134
+											<div class="col-xs-12 itp_in fnPoOwnerNm"></div>
135
+										</div>
136
+									</div>
137
+									<div class="col-xs-11" style="padding:0; width:90%;">
138
+										<label class="col-xs-2">주소</label>
139
+										<div class="col-xs-8 itp_form_it">
140
+											<div class="col-xs-12 itp_in fnPoAddr"></div>
141
+										</div>
142
+									</div>
143
+								</div>	
144
+							</div>
145
+						</div>
146
+						<div id="ITP_BIZPOP_COL_PICK_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
147
+							<div id="ITP_BIZPOP_COL_PICK_PRN_jqGridView" class="itp_views fix"></div>
148
+							<table id="ITP_BIZPOP_COL_PICK_PRN_jqGrid"></table>
149
+							<div id="ITP_BIZPOP_COL_PICK_PRN_jqGridPager"></div>
150
+							<div id="ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty" class="itp_no_data"></div>
151
+						</div>
152
+					</div>
153
+				</div>
154
+			</form>
155
+		</div>
156
+	</div>
157
+
158
+	<div id="ITP_POPUP_JS"></div>
159
+</div>

+ 355 - 0
src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -0,0 +1,355 @@
1
+require(['config'], function() {
2
+	require([
3
+	], function($) {
4
+		pageObj.init();
5
+	});
6
+});
7
+
8
+
9
+//화면변수
10
+const COLLMNG03010_GRID_ID = '#ITP_COLLMNG03010_jqGrid';
11
+const COLLMNG03010_GRID_LIST = '#ITP_COLLMNG03010_jqGrid_list';
12
+const COLLMNG03010_GRID_PAGER = '#ITP_COLLMNG03010_jqGridPager';
13
+const COLLMNG03010_GRID_EMPTY = '#ITP_COLLMNG03010_jqGridEmpty';
14
+
15
+
16
+//API URL
17
+let API_RTNMNG_INOUTMNG_SPPLY_PICK_GRID_LIST ='/api/rtnmng/inoutmng/spply-pick-grid-list';
18
+
19
+
20
+//화면 grid ColModel
21
+const gridColModel = {
22
+	list:[
23
+		{
24
+			index: 'VIEW_CD', name: 'viewCd',
25
+			label: ITP_MSG_LOCALE.label.viewCd,
26
+			width: '10', fixed: false, align: 'center',
27
+			sortable: false, hidden: true
28
+		},
29
+		{
30
+			index: 'BRAND_ID', name: 'brandId',
31
+			label: ITP_MSG_LOCALE.label.brandId,
32
+			width: '10', fixed: false, align: 'center',
33
+			sortable: false, hidden: true
34
+		},
35
+		{
36
+			index: 'BRAND_NM', name: 'brandNm',
37
+			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
38
+			width: '10', fixed: false, align: 'center',
39
+			sortable: false, hidden: false
40
+		},
41
+		{
42
+			index: 'COL_PICK_UNQ_NO', name: 'colPickUnqNo',
43
+			label: ITP_MSG_LOCALE.label.colPickUnqNo,		// 수거서번호
44
+			width: '10', fixed: false, align: 'center',
45
+			sortable: false, hidden: false
46
+		},
47
+		{
48
+			index: 'PICK_ST_NM', name: 'pickStNm',
49
+			label: ITP_MSG_LOCALE.label.pickStNm,			// 수거서상태
50
+			width: '8', fixed: false, align: 'center',
51
+			sortable: false, hidden: false
52
+		},
53
+		{
54
+			index: 'COL_REQ_DT', name: 'colRegDt',
55
+			label: ITP_MSG_LOCALE.label.colRegDt,			// 수거일자
56
+			width: '10', fixed: false, align: 'center',
57
+			sortable: false, hidden: false
58
+		},
59
+		{
60
+			index: 'COL_REQ_DT', name: 'colReqDt',
61
+			label: ITP_MSG_LOCALE.label.colReqDt,			// 수거요청일
62
+			width: '10', fixed: false, align: 'center',
63
+			sortable: false, hidden: false
64
+		},
65
+		{
66
+			index: 'COL_SCH_DT', name: 'colSchDt',
67
+			label: ITP_MSG_LOCALE.label.colSchDt,			// 수거예정일
68
+			width: '10', fixed: false, align: 'center',
69
+			sortable: false, hidden: false
70
+		},
71
+		{
72
+			index: 'ITEM_ID', name: 'itemId',
73
+			label: ITP_MSG_LOCALE.label.itemId,				// 품목번호
74
+			width: '10', fixed: false, align: 'center',
75
+			sortable: false, hidden: false
76
+		},
77
+		{
78
+			index: 'ITEM_NM', name: 'itemNm',
79
+			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
80
+			width: '8', fixed: false, align: 'center',
81
+			sortable: false, hidden: false
82
+		},
83
+		{
84
+			index: 'COL_REQ_QTY', name: 'colReqQty',
85
+			label: ITP_MSG_LOCALE.label.colReqQty,			// 수거수량
86
+			width: '6', fixed: false, align: 'center',
87
+			sortable: false, hidden: false
88
+		},		
89
+		{
90
+			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
91
+			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm,		// 반품사유구분
92
+			width: '10', fixed: false, align: 'center',
93
+			sortable: false, hidden: false
94
+		},
95
+		{
96
+			index: 'UNIT_AMT', name: 'unitAmt',
97
+			label: ITP_MSG_LOCALE.label.unitAmt,			// 단가
98
+			width: '7', fixed: false, align: 'center',
99
+			sortable: false, hidden: false
100
+		},
101
+		{
102
+			index: 'COL_REQ_AMT', name: 'colReqAmt',
103
+			label: ITP_MSG_LOCALE.label.colReqAmt,			// 수거금액
104
+			width: '9', fixed: false, align: 'center',
105
+			sortable: false, hidden: false
106
+		},
107
+		{
108
+			index: 'WHS_NM', name: 'whsNm',
109
+			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
110
+			width: '10', fixed: false, align: 'center',
111
+			sortable: false, hidden: false
112
+		},
113
+		{
114
+			index: 'PICK_MGR_NM', name: 'pickMgrNm',
115
+			label: ITP_MSG_LOCALE.label.pickMgrNm,			// 수거담당자
116
+			width: '10', fixed: false, align: 'center',
117
+			sortable: false, hidden: false
118
+		},
119
+		{
120
+			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
121
+			label: ITP_MSG_LOCALE.label.pickMgrTelNo,		// 수거담당자연락처
122
+			width: '10', fixed: false, align: 'center',
123
+			sortable: false, hidden: false
124
+		}
125
+	],
126
+	view: [],
127
+	detail: []
128
+};
129
+
130
+
131
+
132
+/*화면공통 Object*/
133
+let pageObj = {
134
+	init: function() {
135
+		this.ui.init();
136
+		this.event.init();
137
+		this.action();
138
+	},
139
+	ui: {
140
+		init: function() {
141
+			this.view();
142
+			this.grid();
143
+			this.ready();
144
+		},
145
+		view: function() {
146
+			// 버튼 권한설정
147
+			fn_proc_btn_auth('COLLMNG03010');
148
+			// 공통코드 표시
149
+			$('select').each(function() {
150
+				if($(this).data('select-code')) {
151
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
152
+				}
153
+			});
154
+			// 조회일자 지정	
155
+			var now = new Date();
156
+			var defaultToDate = new Date(now);
157
+			defaultToDate.setDate(now.getDate() + 10);
158
+			$('#ITP_TAB_COLLMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
159
+			$('#ITP_FORM_COLLMNG03010_SEARCH_FROM_DT').datepicker('setDate', '2020.10.01');
160
+			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', '2024.10.10');
161
+		},
162
+		grid: function() {
163
+			itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');
164
+			listObj.empty.init();
165
+			itp_fn_fire_window_resize();
166
+		},
167
+		ready: function() {
168
+			listObj.init();
169
+		}
170
+	},
171
+	event: {
172
+		init: function() {
173
+			this.button();
174
+		},
175
+		button: function() {
176
+			// 버튼 클릭 이벤트
177
+			$('button').each(function() {
178
+				var id = $(this).attr('id');
179
+				$(this).on('click', function() {
180
+					switch (id) {
181
+						case 'ITP_BTN_COLLMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
182
+						case 'ITP_BTN_COLLMNG03010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
183
+						case 'ITP_BTN_COLLMNG03010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
184
+						case 'ITP_BTN_COLLMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
185
+						case 'ITP_BTN_COLLMNG03010_DELETE'			: modifyObj.button.del();		break;	// 발주 취소 버튼(예정)
186
+					}
187
+				});
188
+			});
189
+		}
190
+	},
191
+	switchScreen: function(mode) {
192
+        $('.itp_det_head').find('button[id^="ITP_BTN_COLLMNG03010_"]').each(function(i) {
193
+            $(this).hide();
194
+        });
195
+        $('#ITP_TAB_COLLMNG03010').find('div[id$="_CONTAINER"]').each(function(i) {
196
+            $(this).hide();
197
+        });
198
+        if(mode == 'LIST') { // 목록
199
+            fn_show_btn_auth_array(['#ITP_BTN_COLLMNG03010_SRH', '#ITP_BTN_COLLMNG03010_NEWREG']);
200
+            $('#ITP_AJAX_COLLMNG03010_LIST_CONTAINER').show();
201
+            $('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
202
+            $('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
203
+            $('#ITP_BTN_COLLMNG03010_SEARCH_WHS_ID').show();
204
+            $('#ITP_BTN_COLLMNG03010_DELETE_WHS_ID').show();
205
+        }
206
+    },
207
+    action: function() {
208
+		var _this = this;
209
+		$('#ITP_BTN_COLLMNG03010_PRINT').on('click', function() {
210
+			_this.popup();
211
+		});
212
+	},
213
+	popup: function() {
214
+		var selectedIds = $(COLLMNG03010_GRID_ID).getGridParam('selarrrow');
215
+		if(selectedIds.length > 1) { // 1이상 선택시
216
+			alert("납품서 하나만 선택해주세요 (대표 납품서번호)") ;//출력
217
+			return; //리턴
218
+		}
219
+		var selRowData ; //변수선언		
220
+		for (var i=selectedIds.length-1; i>=0; i--) {		//1개만 선택시
221
+			selRowData = $(COLLMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
222
+		}
223
+		const key = {brandId: selRowData.brandId, colPickUnqNo: selRowData.colPickUnqNo};		// popup key 값 설정
224
+		fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
225
+	}
226
+};
227
+
228
+
229
+/*목록화면 Object*/
230
+let listObj = {
231
+	init: function() {
232
+		this.grid.init();
233
+		this.action();
234
+	},
235
+	itp_COLLMNG03010_param: {},
236
+	itp_COLLMNG03010_search: false,
237
+	button: {
238
+		search: function() {
239
+			listObj.itp_COLLMNG03010_search = true;
240
+			let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
241
+			param.gridSize = $.jgrid.defaults.rowNum;
242
+            param.gridPage = $.jgrid.defaults.page;
243
+            param.sbrandId = 'BRD221100002';
244
+            param.sspplyId = 'SPY221100004';
245
+            console.log(1234);
246
+            console.log(JSON.stringify(param));
247
+            $(COLLMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
248
+        }
249
+	},
250
+	empty: {
251
+		init: function() {
252
+			var _this = this;
253
+            this.push();
254
+            $(COLLMNG03010_GRID_EMPTY).on('click', function() {
255
+                _this.back();
256
+                listObj.itp_COLLMNG03010_param.gridSize = $.jgrid.defaults.rowNum;
257
+                $(COLLMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_COLLMNG03010_param)}).trigger('reloadGrid');
258
+            });
259
+		},
260
+		push: function() {
261
+            let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
262
+            listObj.itp_COLLMNG03010_param = param;
263
+            param.sbrandId = 'BRD221100002';
264
+            param.sspplyId = 'SPY221100004';
265
+        },
266
+        back: function() {
267
+            $('#ITP_FORM_COLLMNG03010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG03010_param.brandType);
268
+            $('#ITP_FORM_COLLMNG03010_SERVICE_ST_CD').val(listObj.itp_COLLMNG03010_param.stCd);
269
+            $('#ITP_FORM_COLLMNG03010_SEARCH_BRAND_NM').val(listObj.itp_COLLMNG03010_param.brandNm);
270
+        }
271
+	},
272
+	grid: {
273
+		init: function() {
274
+			// 데이터 없을때
275
+            listObj.empty.push();
276
+            this.search();
277
+		},
278
+		colModel: gridColModel.list,
279
+		search: function() {
280
+			pageObj.switchScreen('LIST');
281
+			this.unload();
282
+			this.load();
283
+		},
284
+		load: function() {
285
+            let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
286
+            param.gridSize = $.jgrid.defaults.rowNum;
287
+            param.sbrandId = 'BRD221100002';
288
+            param.sspplyId = 'SPY221100004';
289
+            console.log(JSON.stringify(param));
290
+            var option = {
291
+            	gridId: COLLMNG03010_GRID_ID,
292
+            	colModel: gridColModel.list,
293
+            	param: param,
294
+            	url: DOMAIN + API_RTNMNG_INOUTMNG_SPPLY_PICK_GRID_LIST,
295
+            	pager: COLLMNG03010_GRID_PAGER,
296
+            	multiselect: true,
297
+				multiboxonly : false,
298
+				rownumbers: false,/*
299
+            	onCellSelect: function(rowId, cellIdx, cellValue) {
300
+                    var cm = $(this).jqGrid('getGridParam', 'colModel');
301
+                    var colNm = cm[cellIdx].name;
302
+                    if (colNm === 'pchPodrUnqNo') {
303
+                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
304
+                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
305
+                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal};
306
+                        var param = $.param(key);
307
+                        modifyObj.init(param);
308
+                    }
309
+				},*/
310
+				loadComplete: function(data) {
311
+					console.log(data);
312
+                    itp_fn_grid_load_complete(data, COLLMNG03010_GRID_ID, true, 'number', 'COLLMNG03010', listObj.itp_COLLMNG03010_search, listObj.empty, true, data.gridRecords, true);
313
+				},
314
+				onPaging: function(action) {
315
+                    itp_fn_grid_paging(COLLMNG03010_GRID_ID, action, param);
316
+                }
317
+            };
318
+            itp_fn_grid_make_remote(option);
319
+		},
320
+		clearData: function() {
321
+			$(COLLMNG03010_GRID_ID).jqGrid('clearGridData', true);
322
+            $(COLLMNG03010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
323
+            $(COLLMNG03010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
324
+            $(COLLMNG03010_GRID_EMPTY).show();
325
+		},
326
+		unload: function() {
327
+			$.jgrid.gridUnload(COLLMNG03010_GRID_ID);
328
+		}
329
+	},
330
+	action: function() {
331
+		var _this = this;
332
+		// 출하창고 조회 버튼 클릭
333
+		$('#ITP_BTN_COLLMNG03010_SEARCH_WHS_ID').on('click', function() {
334
+			_this.popup();
335
+		});
336
+		// 출하창고 텍스트 삭제 버튼 클릭
337
+		$('#ITP_BTN_COLLMNG03010_DELETE_WHS_ID').on('click', function() {
338
+			$('#ITP_FORM_COLLMNG03010_SEARCH_WHS_NM').val('');
339
+			$('#ITP_FORM_COLLMNG03010_SEARCH_WHS_ID').val('');
340
+		});
341
+	},
342
+	popup: function() {
343
+		var popFn = this.callback.create;
344
+		
345
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: ''};
346
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
347
+	},
348
+	callback: {
349
+		create: function(rowDataPop) {
350
+			console.log(rowDataPop);
351
+			$('#ITP_FORM_COLLMNG03010_SEARCH_WHS_ID').val(rowDataPop.whsId);
352
+			$('#ITP_FORM_COLLMNG03010_SEARCH_WHS_NM').val(rowDataPop.whsNm);
353
+		}
354
+	}
355
+};

+ 4 - 4
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -228,7 +228,7 @@ let pageObj = {
228 228
             $('#ITP_FORM_INOUTMNG02010_DETAIL #ITP_FORM_INOUTMNG02010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
229 229
 
230 230
             $('.fnBrandId').text('(자동부여)');
231
-        } */else if(mode == 'MODIFY') { // 수정
231
+        } else if(mode == 'MODIFY') { // 수정
232 232
             $('#ITP_AJAX_INOUTMNG02010_DETAIL_CONTAINER').show();
233 233
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG02010_CANCELLIST', '#ITP_BTN_INOUTMNG02010_SAVE']);
234 234
 
@@ -250,7 +250,7 @@ let pageObj = {
250 250
         } else if(mode == 'VIEW') { // 보기
251 251
             $('#ITP_AJAX_INOUTMNG02010_VIEW_CONTAINER').show();
252 252
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG02010_MODIFY', '#ITP_BTN_INOUTMNG02010_CANCELLIST']);
253
-        }
253
+        }*/
254 254
     },
255 255
     action: function() {
256 256
     	var _this = this;
@@ -262,14 +262,14 @@ let pageObj = {
262 262
 	popup: function() {		
263 263
 		var selectedIds = $(INOUTMNG02010_GRID_ID).getGridParam('selarrrow');
264 264
 		if(selectedIds.length > 1) { // 1이상 선택시
265
-		   alert("납품서 하나만 선택해주세요 (대표 납품서번호)") ;//출력
265
+			alert("납품서 하나만 선택해주세요 (대표 납품서번호)") ;//출력
266 266
 			return; //리턴
267 267
 		}
268 268
 		var selRowData ; //변수선언		
269 269
 		for (var i=selectedIds.length-1; i>=0; i--) {		//1개만 선택시
270 270
 			selRowData = $(INOUTMNG02010_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
271 271
 		}
272
-		const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.dlvSttmtUnqNo};		// popup key 값 설정
272
+		const key = {brandId: fn_make_user_info.get('brandId'), dlvSttmtUnqNo: selRowData.dlvSttmtUnqNo};		// popup key 값 설정
273 273
 		fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
274 274
 	}
275 275
 };

+ 14 - 3
src/main/webapp/js/app/locales/locale-ko.js

@@ -237,7 +237,7 @@ const ITP_MSG_LOCALE = (function() {
237 237
 			"selChk": "대상선택",
238 238
 			"rtnPodrUnqNo": "반품발주번호",
239 239
 			"rtnOdrStCd": "반품발주상태코드",
240
-			"rtnOdrStNm": "품발주상태명",
240
+			"rtnOdrStNm": "품발주상태명",
241 241
 			"rtnOdrRegDt": "반품발주일자",
242 242
 			"colReqDt": "수거요청일",
243 243
 			"rtnWhsNm": "수거장소",
@@ -245,8 +245,19 @@ const ITP_MSG_LOCALE = (function() {
245 245
 			"rtnDodrItemQty": "수거품목수",
246 246
 			"rtnMgrNm": "수거 담당자",
247 247
 			"rtnPodrDtlNo": "반품발주항번",
248
-			"rtnReqQty": "수거수량",
249
-			"rtnAmt": "수거금액"
248
+			"rtnReqQty": "반품수량",
249
+			"rtnAmt": "반품금액",
250
+			"colPickUnqNo": "수거서번호",
251
+			"pickStCd": "수거서상태코드",
252
+			"pickStNm": "수거서상태",
253
+			"colRegDt": "수거일자",
254
+			"colSchDt": "수거예정일",
255
+			"colReqQty": "수거수량",
256
+			"rtnRsnDvsn": "반품사유구문코드",
257
+			"rtnRsnDvsnNm": "반품사유구분",
258
+			"colReqAmt": "수거금액",
259
+			"pickMgrNm": "수거담당자",
260
+			"pickMgrTelNo": "수거담당자연락처"
250 261
 		},
251 262
 		"table": {
252 263
 			"brandId": "브랜드ID",

+ 237 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_COL_STTMT_PRN.js

@@ -0,0 +1,237 @@
1
+require(['config'], function() {
2
+	require([
3
+		'jquery'
4
+	], function($) {
5
+
6
+	});
7
+});
8
+
9
+let API_POP_INV_INFO = '/api/pomng/inoutmng/info-inv';
10
+
11
+const THIS_FORM_ID = '#ITP_FORM_BIZPOP_COL_PICK_PRN';
12
+const THIS_GIRD_ID = '#ITP_BIZPOP_COL_PICK_PRN_jqGrid';
13
+const THIS_GIRD_LIST = '#ITP_BIZPOP_COL_PICK_PRN_jqGrid_list';
14
+const THIS_GIRD_PAGER = '#ITP_BIZPOP_COL_PICK_PRN_jqGridPager';
15
+const THIS_GIRD_EMPTY = '#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty';
16
+
17
+function itp_fn_BIZPOP_COL_PICK_PRN(parentPopFn, args, returnType) {
18
+	
19
+	
20
+	let itp_BIZPOP_COL_PICK_PRN_param = args;
21
+	let itp_BIZPOP_COL_PICK_PRN_search = false;
22
+
23
+	
24
+	$('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID').val(args.brandId);
25
+	$('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO').val(args.dlvSttmtUnqNo);
26
+	
27
+
28
+	$('#ITP_BIZPOP_COL_PICK_PRN').one('shown.bs.modal', function(e) {
29
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_COL_PICK_PRN_jqGrid_list', '');
30
+		itp_fn_fire_window_resize();
31
+	}).one('hidden.bs.modal', function(e) {
32
+		$('#ITP_BIZPOP_COL_PICK_PRN').remove();
33
+	}).modal('show');
34
+
35
+
36
+	$('#ITP_BIZPOP_COL_PICK_PRN_BTN_SEARCH').on('click', function() {
37
+		//인쇄부분 여기에 추가함
38
+	});
39
+/*	
40
+	$('#ITP_BIZPOP_PO_REJECT_BTN_CANCEL').on('click', function() {
41
+		let transParm = {pchReqUnqNo: $('#ITP_FORM_ITP_BIZPOP_PO_REJECT_PCH_REQ_UNQ_NO').val(),pchReqRjctRsn: '', retVal:'N', storeId:$('#ITP_FORM_ITP_BIZPOP_PO_REJECT_STORE_ID').val()}
42
+		parentPopFn(transParm);
43
+		$('#ITP_BIZPOP_PO_REJECT').modal('hide'); // 팝업닫기
44
+	});
45
+*/
46
+
47
+	$('#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty').on('click', function() {
48
+		itp_fn_BIZPOP_COL_PICK_PRN_empty.back();
49
+		//itp_BIZPOP_PO_REJECT_param.gridSize = 10;
50
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_COL_PICK_PRN_param)}).trigger('reloadGrid');
51
+	});
52
+
53
+	var itp_fn_BIZPOP_COL_PICK_PRN_empty = {
54
+		push: function() {
55
+			let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID').val(), dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO').val() };
56
+			itp_BIZPOP_COL_PICK_PRN_param = param;
57
+		},
58
+		back: function() {
59
+		}
60
+	};
61
+
62
+	itp_fn_BIZPOP_COL_PICK_PRN_empty.push();
63
+	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID').val(), dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO').val() };
64
+	console.log(JSON.stringify(param));
65
+	
66
+	const gridColModel = {
67
+		detail: [
68
+			{
69
+					index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
70
+					label: '발주번호', //
71
+					width: '10', fixed: false, align: 'center',
72
+					sortable: false, hidden: false
73
+				},
74
+				{
75
+					index: 'ITEM_ID', name: 'itemId',
76
+					label: '품목번호', //
77
+					width: '10', fixed: false, align: 'center',
78
+					sortable: false, hidden: false
79
+				},
80
+				{
81
+					index: 'ITEM_NM', name: 'itemNm',
82
+					label: '품목명', //
83
+					width: '10', fixed: false, align: 'center',
84
+					sortable: false, hidden: false
85
+				},
86
+				{
87
+					index: 'PODR_QTY', name: 'podrQty',
88
+					label: '발주수량', //
89
+					width: '5', fixed: false, align: 'center',
90
+					sortable: false, hidden: false
91
+				},
92
+				{
93
+					index: 'COL_QTY', name: 'dlvQty',
94
+					label: '납품서수량', //
95
+					width: '5', fixed: false, align: 'center',
96
+					sortable: false, hidden: false
97
+				},
98
+				{
99
+					index: 'EXPRY_DATE', name: 'expryDate',
100
+					label: '유통기한', //
101
+					width: '10', fixed: false, align: 'center',
102
+					sortable: false, hidden: false
103
+				}
104
+		]
105
+	};
106
+	
107
+	pageObj.call(param);
108
+	pageObj.button();
109
+};
110
+
111
+
112
+let pageObj = {
113
+	init: function() {
114
+		this.button();
115
+	},
116
+	call: function( param) {
117
+		fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
118
+	},
119
+	button: function() {
120
+		$('#ITP_BIZPOP_COL_PICK_PRN_BTN_PRINT').on('click', function (printDiv){
121
+			  var divToPrint=document.getElementById('ITP_BIZPOP_COL_PICK_PRN_PRINT_AREA');
122
+
123
+			  var newWin=window.open('','Print-Window');
124
+
125
+			  newWin.document.open();
126
+
127
+			  newWin.document.write('<html><body onload="window.print()">'+divToPrint.innerHTML+'</body></html>');
128
+
129
+			  newWin.document.close();
130
+
131
+			  setTimeout(function(){newWin.close();},10);
132
+		});
133
+
134
+		
135
+	}, 
136
+	
137
+	callback: function (result) {
138
+		console.log(result);
139
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnColPickUnqNo').text(result.colPickUnqNo);
140
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnColRegDt').text(result.colRegDt);
141
+		
142
+		$('#ITP_BIZPOP_DLV_PICK_PRN .fnPickMgrNm').text(result.pickMgrNm);
143
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnWhsAddr').text(result.whsAddr);
144
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnPndrTelNo').text(result.pndrTelNo);
145
+		
146
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnColBsnsRegno').text(result.colBsnsRegno);
147
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnColNm').text(result.colNm);
148
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnColOwnerNm').text(result.colOwnerNm);
149
+		$('#ITP_BIZPOP_DLV_PICK_PRN .fnColAddr').text(result.colAddr);
150
+		
151
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnBsnsRegno').text(result.rtnBsnsRegno);
152
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnNm').text(result.rtnNm);
153
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnOwnerNm').text(result.rtnOwnerNm);
154
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnAddr').text(result.rtnAddr);
155
+		
156
+		$('#ITP_BIZPOP_COL_PICK_PRN .fnDlvQty').text(result.dlvQty);
157
+		
158
+		// 품목  리스트 조회
159
+		pageObj.grid.init(result.pickDtlInfoList);
160
+	},
161
+	grid: {
162
+		init: function(gridRows) {
163
+			this.gridRows = gridRows;
164
+			this.unload();
165
+			this.load(gridRows);
166
+		},
167
+		gridId: '#ITP_BIZPOP_COL_PICK_PRN_jqGrid',
168
+		gridList: '#ITP_BIZPOP_COL_PICK_PRN_jqGrid_list',
169
+		gridEmpty: '#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty',
170
+		gridRows: '',
171
+		load : function(gridRows) {
172
+			var _this = this;
173
+			var option = {
174
+				gridId: _this.gridId,
175
+				colModel: [
176
+						{
177
+								index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
178
+								label: '반품발주번호', //
179
+								width: '10', fixed: false, align: 'center',
180
+								sortable: false, hidden: false
181
+							},
182
+							{
183
+								index: 'ITEM_ID', name: 'itemId',
184
+								label: '품목번호', //
185
+								width: '10', fixed: false, align: 'center',
186
+								sortable: false, hidden: false
187
+							},
188
+							{
189
+								index: 'ITEM_NM', name: 'itemNm',
190
+								label: '품목명', //
191
+								width: '10', fixed: false, align: 'center',
192
+								sortable: false, hidden: false
193
+							},
194
+							{
195
+								index: 'COL_REQ_QTY', name: 'colReqQty',
196
+								label: '수거요청수량', //
197
+								width: '5', fixed: false, align: 'center',
198
+								sortable: false, hidden: false
199
+							},
200
+							{
201
+								index: 'RODR_QTY', name: 'rodrQty',
202
+								label: '수거수량', //
203
+								width: '5', fixed: false, align: 'center',
204
+								sortable: false, hidden: false
205
+							},
206
+							{
207
+								index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
208
+								label: '수거사유구분', //
209
+								width: '10', fixed: false, align: 'center',
210
+								sortable: false, hidden: false
211
+							},
212
+							{
213
+								index: 'RTN_RSN', name: 'rtnRsn',
214
+								label: '수거사유', //
215
+								width: '10', fixed: false, align: 'center',
216
+								sortable: false, hidden: false
217
+							}
218
+					],
219
+				data: gridRows,
220
+				multiselect: false,
221
+				loadComplete: function(data) {
222
+					$('#ITP_BIZPOP_COL_PICK_PRN_jqGrid').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
223
+					data.records === 0 ? _this.clearData() : $('#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty').hide();
224
+				},
225
+				onCellSelect: function(rowid, cellIdx, cellValue) {
226
+				}
227
+			};
228
+			itp_fn_grid_make_local(option);
229
+		},
230
+		unload : function() {
231
+			$.jgrid.gridUnload(this.gridId);
232
+		}
233
+	}
234
+};
235
+
236
+
237
+