marseyes пре 2 година
родитељ
комит
b3ca908912

+ 15 - 3
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_STOCK_PROC.js

@@ -63,14 +63,26 @@ var popPageObj = {
63 63
 		
64 64
 		var vali_moveQty = itp_fn_form_validate(formId, formId + '_MOVE_QTY', ['empty','number'], undefined);
65 65
 		
66
-		if (vali_moveQty) {
67
-			
66
+		if (vali_moveQty) {			
67
+			// 창고 & 로케이션 비교
68
+			if($('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID').val() == $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID').val() 
69
+			&& $('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION').val() == $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION').val()) {
70
+				itp_fn_modal_alert_ajax('동일한 로케이션으로 재고처리를 할 수 없습니다.');
71
+				return;
72
+			}
73
+			var stckQty = parseInt($('#ITP_FORM_PO_STOCK_PROC_POPUP .fnStckQty').text());
74
+			var moveQty = parseInt($('#ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY').val());
75
+			if(moveQty > stckQty) {
76
+				itp_fn_modal_alert_ajax('이동수량은 현재고수량 이하로 입력하세요.');
77
+				return;
78
+			}
68 79
 			
69 80
 			let param = $(formId).serializeObject();
70 81
 			// param.gridInsertData = gridInsertData;
71 82
 			// console.log(JSON.stringify(param));
72 83
 			var callbackFn = function() {
73
-				// 팝업닫기
84
+				popPageObj.parentPopFn();
85
+				$('#ITP_BIZPOP_PO_STOCK_PROC').modal('hide'); // 팝업닫기
74 86
 			};
75 87
 			fn_ajax_call(STOCK_MNG_PROC_STOCK, JSON.stringify(param), callbackFn, 'POST');
76 88
 		}

+ 4 - 4
src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -71,7 +71,7 @@ const gridColModel = {
71 71
 		{
72 72
 			index: 'ITEM_ID', name: 'itemId',
73 73
 			label: "품목번호", 
74
-			width: '8', fixed: false, align: 'center',
74
+			width: '11', fixed: false, align: 'center',
75 75
 			sortable: false, hidden: false
76 76
 		},
77 77
 		{
@@ -83,7 +83,7 @@ const gridColModel = {
83 83
 		{
84 84
 			index: 'UNIT', name: 'unit',
85 85
 			label: "단위", 
86
-			width: '8', fixed: false, align: 'center',
86
+			width: '7', fixed: false, align: 'center',
87 87
 			sortable: false, hidden: false
88 88
 		},
89 89
 		{
@@ -260,8 +260,8 @@ let listObj = {
260 260
 			var itemId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).itemId;
261 261
 			
262 262
 			var args = {'brandId': brandId, 'whsId': whsId, 'location': location, 'itemId': itemId};			
263
-			fn_call_popup('biz', 'BIZPOP_PO_STOCK_PROC', '#ITP_ASIDE', function(rowDataPop) {
264
-				
263
+			fn_call_popup('biz', 'BIZPOP_PO_STOCK_PROC', '#ITP_ASIDE', function() {
264
+				listObj.button.search(); // 조회
265 265
 			}, args, 'S');
266 266
 		}, 
267 267
 		clickStockHist: function() {