Ver código fonte

입고처리, 정산현황 세부조정

yhl88 2 anos atrás
pai
commit
b57cc93a75

+ 4 - 31
src/main/webapp/js/app/pomng/ITP_POMNG06010.js

@@ -146,12 +146,12 @@ const gridColModel = {
146 146
 		{
147 147
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
148 148
 			label: ITP_MSG_LOCALE.label.dlvMgrNm, //납품담당자명
149
-			width: '12', fixed: false, align: 'left',
149
+			width: '12', fixed: false, align: 'center',
150 150
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
151 151
 		},		
152 152
 		{
153 153
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
154
-			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
154
+			label: '납품자연락처',
155 155
 			width: '15', fixed: false, align: 'center',
156 156
 			minwidth: 110,
157 157
 			sortable: false, hidden: false
@@ -238,35 +238,28 @@ let listObj = {
238 238
 				alert("입고창고를 지정해주세요!");
239 239
 				return;
240 240
 			}
241
-			
242 241
 			if (param.fromDt == '' || param.toDt == '') {
243 242
 				alert("납품예정일 기간을 지정해주세요!");
244 243
 				return;
245 244
 			}
246
-			
247 245
 			$(POMNG06010_GRID_ID).setGridParam({ 'postData': JSON.stringify(param) }).trigger('reloadGrid');
248 246
 		},
249 247
 		save: function() {
250
-			
251 248
 			$('body').trigger('click');
252
-			
253 249
 				var modalFn = {
254 250
 					callBack: () => {
255 251
 						//itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
256 252
 						var chkQtyYn = "N";
257 253
 						let gridInsertData = [];
258 254
 						const rowData = $(POMNG06010_GRID_ID).getRowData();
259
-						var cwhsId = "";
260
-						
255
+						var cwhsId = "";						
261 256
 						$.each(rowData, function(key, value) {
262
-							
263 257
 							if (value.whsQty != '') {
264 258
 								if (parseInt(value.whsQty) > parseInt(value.dlvQty)) {
265 259
 									alert("납품수량보다 입고수량이 더 많습니다.");
266 260
 									chkQtyYn = "Y";
267 261
 									return false;
268 262
 								}
269
-								
270 263
 								if (cwhsId != "" && cwhsId != value.whsId) {
271 264
 									alert("서로 다른 입고창고 품목은 처리할 수 없습니다.");
272 265
 									chkQtyYn = "Y";
@@ -275,18 +268,12 @@ let listObj = {
275 268
 								cwhsId = value.whsId;
276 269
 								gridInsertData.push(value);
277 270
 							}
278
-							
279 271
 						});
280
-						
281 272
 						if (chkQtyYn == "Y") return;
282
-						
283 273
 						if (gridInsertData.length == 0) {
284 274
 							alert("입고처리할 품목에 입고수량을 입력해주세요!");
285 275
 							return ;
286 276
 						}
287
-						
288
-						
289
-						
290 277
 						let param = {};
291 278
 						param.viewCd = "C";
292 279
 						param.whsId = cwhsId;
@@ -303,9 +290,7 @@ let listObj = {
303 290
 						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
304 291
 					}
305 292
 				};
306
-			
307
-				itp_fn_modal_confirm('입고처리 하시겠습니까?', modalFn);
308
-			
293
+			itp_fn_modal_confirm('입고처리 하시겠습니까?', modalFn);
309 294
 		}
310 295
 	},
311 296
 	action: function() {
@@ -333,17 +318,13 @@ let listObj = {
333 318
 	},
334 319
 	popup: function(arg) {
335 320
 		var popFn = this.callback.create;
336
-
337 321
 		var whsDvsn = "";
338
-		
339 322
 		if (fn_make_user_info.get('storeId') == "") {
340 323
 			whsDvsn = "W01";
341 324
 		} else { 
342 325
 			whsDvsn = "W02";
343 326
 		}
344
-		
345 327
 		//param.sstoreId = fn_make_user_info.get('storeId');
346
-		
347 328
 		if(arg === 'spply'){
348 329
 			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
349 330
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
@@ -351,7 +332,6 @@ let listObj = {
351 332
 			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:whsDvsn};
352 333
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
353 334
 		}
354
-		
355 335
 	},
356 336
 	callback: {
357 337
 		create: function(rowDataPop) {
@@ -378,20 +358,15 @@ let listObj = {
378 358
 						case 'ITP_BTN_POMNG06010_SRH': listObj.button.search(); break;	// 조회 버튼 클릭
379 359
 						case 'ITP_BTN_POMNG06010_MODIFY': listObj.button.save(); break;	// 입고처리 버튼
380 360
 						case 'ITP_BTN_POMNG06010_EXCEL': listObj.excelDown(); break;	// excel 버튼
381
-
382 361
 					}
383 362
 				});
384 363
 			});
385
-
386 364
 			$('body').on('click', function(e) {
387 365
 				var gridId = POMNG06010_GRID_ID.replace('#', '');
388 366
 				var rids = $(POMNG06010_GRID_ID).jqGrid('getDataIDs');
389 367
 				var last_row_id = rids[rids.length - 1];
390
-
391 368
 				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'POMNG06010');
392 369
 			});
393
-
394
-
395 370
 		}
396 371
 	},
397 372
 	empty: {
@@ -430,7 +405,6 @@ let listObj = {
430 405
 			listObj.empty.push();
431 406
 			itp_fn_jqgrid_resize(POMNG06010_GRID_ID, POMNG06010_GRID_LIST, 'lg');
432 407
 			this.search();
433
-
434 408
 		},
435 409
 		colModel: gridColModel.list,
436 410
 		search: function() {
@@ -476,7 +450,6 @@ let listObj = {
476 450
 			$(POMNG06010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
477 451
 			$(POMNG06010_GRID_EMPTY).show();
478 452
 		}
479
-		
480 453
 	},
481 454
 	screen: function() {
482 455
 		$('#ITP_BTN_POMNG06010_DELETE_WHS_ID').show();

+ 3 - 3
src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -158,14 +158,14 @@ const gridColModel = {
158 158
 		{
159 159
 			index: 'ITEM_NM', name: 'itemNm',
160 160
 			label: "품목명",
161
-			width: '10', fixed: false, align: 'left',
161
+			width: '12', fixed: false, align: 'left',
162 162
 			sortable: false, editable: false, edittype: 'text',
163 163
 			classes: 'ui-ellipsis'
164 164
 		},
165 165
 		{
166 166
 			index: 'UNIT', name: 'unit',
167 167
 			label: "단위",
168
-			width: '8', fixed: false, align: 'center',
168
+			width: '6', fixed: false, align: 'center',
169 169
 			sortable: false, editable: false, edittype: 'text'
170 170
 		},
171 171
 		{
@@ -218,7 +218,7 @@ const gridColModel = {
218 218
 		{
219 219
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
220 220
 			label: "발주번호",
221
-			width: '10', fixed: false, align: 'right',
221
+			width: '10', fixed: false, align: 'center',
222 222
 			sortable: false, editable: false, edittype: 'text'
223 223
 		},
224 224
 		{