Explorar el Código

Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

juney hace 2 años
padre
commit
6d48014ccc

+ 16 - 12
src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -5,6 +5,7 @@
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_INOUTMNG01010_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_INOUTMNG01010_OUC" class="btn btn-success btn-sm OUC" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;출하생성&nbsp;&nbsp;</button>
8 9
 					<button type="button" id="ITP_BTN_INOUTMNG01010_OUT" class="btn btn-success btn-sm OUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;출하지시&nbsp;&nbsp;</button>
9 10
 					<button type="button" id="ITP_BTN_INOUTMNG01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
10 11
 				</div>
@@ -15,6 +16,8 @@
15 16
 						<div class="itp_srh_border fix">
16 17
 							<div class="col-xs-12">
17 18
 								<form id="ITP_FORM_INOUTMNG01010_SEARCH" class="form-horizontal">
19
+								   <input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_SBRAND_ID" class="form-control itp_input" name="sbrandId" />
20
+								
18 21
 									<div class="form-group">
19 22
 										<div class="col-xs-2 itp_ip itp_noMar">
20 23
 											<select id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_REQ_DT" class="form-control itp_input" name="serviceDlvReqDt">
@@ -64,11 +67,12 @@
64 67
 						</div>
65 68
 					</div>
66 69
 				</div>
67
-				<div id="ITP_AJAX_INOUTMNG01010_VIEW_CONTAINER" >
70
+				<div id="ITP_AJAX_INOUTMNG01010_DETAIL_CONTAINER" >
68 71
 					<div class="itp_form itp_type1 fix">
69 72
 						<div class="col-xs-12">
70
-							<form id="ITP_FORM_INOUTMNG01010_VIEW" class="form-horizontal">
71
-								<input type="hidden" id="ITP_FORM_INOUTMNG01010_VIEW_" name="" value="">
73
+							<form id="ITP_FORM_INOUTMNG01010_DETAIL" class="form-horizontal">
74
+								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_" name="" value="">
75
+								<input type="hidden" id="ITP_FORM_INOUTMNG01010_DETAIL_BRAND_ID" class="form-control itp_input" name="brandId" />
72 76
 								<section class="itp_form_sec">
73 77
 									<h4 class="itp_form_tit">출하지시 기본정보</h4>
74 78
 									<div class="itp_form_in">
@@ -81,8 +85,8 @@
81 85
 											</div>
82 86
 											<label class="col-xs-2 itp_lb">납품일자 *</label>
83 87
 											<div class="col-xs-4 itp_ip">
84
-												<div class="col-xs-7 itp_in">
85
-													<input type="date" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_DT" data-check-required="empty" class="form-control itp_input" name="dlvDt" value="">
88
+												<div class="input-daterange input-group date">
89
+													<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
86 90
 												</div>
87 91
 											</div>
88 92
 										</div>
@@ -90,13 +94,13 @@
90 94
 											<label class="col-xs-2 itp_lb">납품담당자 *</label>
91 95
 											<div class="col-xs-4 itp_ip">
92 96
 												<div class="col-xs-7 itp_in">
93
-													<input type="text" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_MGR_NM" data-check-required="empty" class="form-control itp_input" name="dlvMgrNm" value="">
97
+													<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_MGR_NM" data-check-required="empty" class="form-control itp_input" name="dlvMgrNm" value="">
94 98
 												</div>
95 99
 											</div>
96 100
 											<label class="col-xs-2 itp_lb">납품담당자 전화번호*</label>
97 101
 											<div class="col-xs-4 itp_ip">
98 102
 												<div class="col-xs-7 itp_in">
99
-													<input type="text" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="dlvMgrTelNo" value="">
103
+													<input type="text" id="ITP_FORM_INOUTMNG01010_DETAIL_DLV_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="dlvMgrTelNo" value="">
100 104
 												</div>
101 105
 											</div>
102 106
 										</div>
@@ -109,11 +113,11 @@
109 113
 						<div class="itp_table_head fix" style="background:#f5f5f5;">
110 114
 							<h4 class="itp_table_tit">출하지시 품목</h4>
111 115
 						</div>
112
-						<div id="ITP_INOUTMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
113
-							<div id="ITP_INOUTMNG01010_VIEW_jqGridView" class="itp_views fix"></div>
114
-							<table id="ITP_INOUTMNG01010_VIEW_jqGrid"></table>
115
-							<div id="ITP_INOUTMNG01010_VIEW_jqGridPager"></div>
116
-							<div id="ITP_INOUTMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
116
+						<div id="ITP_INOUTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
117
+							<div id="ITP_INOUTMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
118
+							<table id="ITP_INOUTMNG01010_DETAIL_jqGrid"></table>
119
+							<div id="ITP_INOUTMNG01010_DETAIL_jqGridPager"></div>
120
+							<div id="ITP_INOUTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
117 121
 						</div>
118 122
 					</div>
119 123
 				</div>

+ 3 - 1
src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -81,7 +81,9 @@
81 81
 											<label class="col-xs-2 itp_lb">수거지시일 *</label>
82 82
 											<div class="col-xs-4 itp_ip">
83 83
 												<div class="col-xs-7 itp_in">
84
-													<input type="date" id="ITP_FORM_INOUTMNG03010_VIEW_COL_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
84
+													<div class="input-daterange input-group date">
85
+														<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_CMD_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
86
+													</div>
85 87
 												</div>
86 88
 											</div>
87 89
 										</div>

+ 2 - 3
src/main/webapp/app/oper/OPER01010.html

@@ -4,9 +4,9 @@
4 4
 			<div class="itp_det_head fix">
5 5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><i class="glyphicon glyphicon-chevron-right"></i> <strong>사용자관리</strong></h2>
6 6
 				<div class="pull-right itp_cicon">
7
-					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i>조회</button>
7
+					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-md SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i>조회</button>
8 8
 					<button type="button" id="ITP_BTN_OPER01010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
9
-					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>신규등록</button>
9
+					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-md NEB" style="display: inline-block;"><i class="glyphicon "></i>신규등록</button>
10 10
 					<button type="button" id="ITP_BTN_OPER01010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon "></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
11 11
 					<button type="button" id="ITP_BTN_OPER01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
12 12
 					<button type="button" id="ITP_BTN_OPER01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
@@ -349,7 +349,6 @@
349 349
 								<button type="button" id="ITP_BTN_OPER01010_NEW_DELROW" class="btn btn-danger btn-sm DEB"><i class="glyphicon"></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
350 350
 							</div>
351 351
 						</div>
352
-
353 352
 						<div id="ITP_OPER01010_NEW_jqGrid_list" class="itp_tb_list">
354 353
 							<div id="ITP_OPER01010_NEW_jqGridView" class="itp_views fix"></div>
355 354
 							<table id="ITP_OPER01010_NEW_jqGrid"></table>

+ 1 - 1
src/main/webapp/app/oper/OPER02010.html

@@ -25,7 +25,7 @@
25 25
 										</div>
26 26
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
27 27
 											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
28
-											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
28
+											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
29 29
 										</div>
30 30
 										<div class="col-xs-2 itp_ip itp_noMar">
31 31
 											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>

+ 1 - 1
src/main/webapp/app/oper/OPER06010.html

@@ -24,7 +24,7 @@
24 24
 										</div>
25 25
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
26 26
 											<button type="button" id="ITP_BTN_OPER06010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
27
-											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
27
+											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
28 28
 										</div>
29 29
 										<div class="col-xs-2 itp_ip itp_noMar">
30 30
 											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>

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

@@ -1,24 +1,24 @@
1
-<div id="ITP_BIZPOP_COL_PICK_PRN" class="modal itp_modal">
1
+<div id="ITP_BIZPOP_COL_STTMT_PRN" class="modal itp_modal">
2 2
 	<div class="modal-dialog" style="width:1200px;">
3 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="">
4
+			<form id="ITP_FORM_BIZPOP_COL_STTMT_PRN">
5
+				<!-- <input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_FORM_DT" name="fromDt" value="">
6
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_TO_DT" name="toDt" value="">
7
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID" name="sbrandId" value="">
8
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_SPPLY_ID" name="sspplyId" value=""> -->
9
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID" name="brandId" value="">
10
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO" name="colPickUnqNo" value="">
11 11
 				<div id="ITP_POPUP_CONTAINER">
12 12
 					<div class="modal-header">
13 13
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
14 14
 						<h5 class="modal-title">가맹점 검색</h5>
15 15
 					</div>
16
-					<div id="ITP_BIZPOP_COL_PICK_PRN_PRINT_AREA" class="modal-body">
16
+					<div id="ITP_BIZPOP_COL_STTMT_PRN_PRINT_AREA" class="modal-body">
17 17
 						<div class="itp_form fix">
18 18
 							<div class="col-xs-12 itp_form_inline">
19 19
 								<div class="form-horizontal fix">
20 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>
21
+										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_COL_STTMT_PRN_BTN_PRINT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
22 22
 									</div>
23 23
 								</div>
24 24
 							</div>
@@ -88,25 +88,25 @@
88 88
 									<div class="col-xs-11" style="padding:0; width:90%;">
89 89
 										<label class="col-xs-4">등록번호</label>
90 90
 										<div class="col-xs-8 itp_form_it">
91
-											<div class="col-xs-12 itp_in fnDlvBsnsRegno"></div>
91
+											<div class="col-xs-12 itp_in fnColBsnsRegno"></div>
92 92
 										</div>
93 93
 									</div>	
94 94
 									<div class="col-xs-11" style="padding:0; width:90%;">
95 95
 										<label class="col-xs-2">상호</label>
96 96
 										<div class="col-xs-8 itp_form_it">
97
-											<div class="col-xs-12 itp_in fnDlvNm"></div>
97
+											<div class="col-xs-12 itp_in fnColNm"></div>
98 98
 										</div>
99 99
 									</div>
100 100
 									<div class="col-xs-11" style="padding:0; width:90%;">
101 101
 										<label class="col-xs-2">성명</label>
102 102
 										<div class="col-xs-8 itp_form_it">
103
-											<div class="col-xs-12 itp_in fnDlvOwnerNm"></div>
103
+											<div class="col-xs-12 itp_in fnColOwnerNm"></div>
104 104
 										</div>
105 105
 									</div>
106 106
 									<div class="col-xs-11" style="padding:0; width:90%;">
107 107
 										<label class="col-xs-2">주소</label>
108 108
 										<div class="col-xs-8 itp_form_it">
109
-											<div class="col-xs-12 itp_in fnDlvAddr"></div>
109
+											<div class="col-xs-12 itp_in fnColAddr"></div>
110 110
 										</div>
111 111
 									</div>
112 112
 								</div>	
@@ -119,35 +119,35 @@
119 119
 									<div class="col-xs-11" style="padding:0; width:90%;">
120 120
 										<label class="col-xs-4">등록번호</label>
121 121
 										<div class="col-xs-8 itp_form_it">
122
-											<div class="col-xs-12 itp_in fnPoBsnsRegno"></div>
122
+											<div class="col-xs-12 itp_in fnRtnBsnsRegno"></div>
123 123
 										</div>
124 124
 									</div>	
125 125
 									<div class="col-xs-11" style="padding:0; width:90%;">
126 126
 										<label class="col-xs-2">상호</label>
127 127
 										<div class="col-xs-8 itp_form_it">
128
-											<div class="col-xs-12 itp_in fnPoNm"></div>
128
+											<div class="col-xs-12 itp_in fnRtnNm"></div>
129 129
 										</div>
130 130
 									</div>
131 131
 									<div class="col-xs-11" style="padding:0; width:90%;">
132 132
 										<label class="col-xs-2">성명</label>
133 133
 										<div class="col-xs-8 itp_form_it">
134
-											<div class="col-xs-12 itp_in fnPoOwnerNm"></div>
134
+											<div class="col-xs-12 itp_in fnRtnOwnerNm"></div>
135 135
 										</div>
136 136
 									</div>
137 137
 									<div class="col-xs-11" style="padding:0; width:90%;">
138 138
 										<label class="col-xs-2">주소</label>
139 139
 										<div class="col-xs-8 itp_form_it">
140
-											<div class="col-xs-12 itp_in fnPoAddr"></div>
140
+											<div class="col-xs-12 itp_in fnRtnAddr"></div>
141 141
 										</div>
142 142
 									</div>
143 143
 								</div>	
144 144
 							</div>
145 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>
146
+						<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
147
+							<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGridView" class="itp_views fix"></div>
148
+							<table id="ITP_BIZPOP_COL_STTMT_PRN_jqGrid"></table>
149
+							<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGridPager"></div>
150
+							<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty" class="itp_no_data"></div>
151 151
 						</div>
152 152
 					</div>
153 153
 				</div>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 7 - 7
src/main/webapp/css/style.css

@@ -151,8 +151,8 @@ a, button {outline:none !important; text-decoration:none !important;}
151 151
 #ITP_HEADER .itp_out {width:70px; height:30px;  float:left; border:1px solid #333; line-height: 28px; background:#fff; margin-top:10px; border-radius: 10px; padding:0 4px;}
152 152
 #ITP_HEADER .itp_out a {padding:8.4px; color:#000; font-size:11px; text-decoration:none;}
153 153
 #ITP_HEADER .itp_tabs {position:relative; z-index:100; transition:all .25s ease; float:right; width:calc(100% - 240px);}
154
-#ITP_HEADER .itp_tabs .nav-tabs {padding:4px 4px 0 4px; background:#fff;}
155
-#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#666; padding:5px 13px 5px 15px; margin-right:4px; outline:none;}
154
+#ITP_HEADER .itp_tabs .nav-tabs {padding:15px 4px 0 15px; background:#fff;}
155
+#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#666; padding:10px 13px 7px 15px; margin-right:6px; outline:none;}
156 156
 #ITP_HEADER .itp_tabs .nav-tabs > li a i.glyphicon-remove {font-size:10px; margin-left:4px; cursor:pointer;}
157 157
 #ITP_HEADER .itp_tabs .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover {background:#fff; color:#666; border:1px solid #ccc; border-bottom-color:transparent; font-weight:700;}
158 158
 #ITP_HEADER .itp_tabs .nav-tabs > li > a:hover {background:#D6E6F3 !important; border:1px solid #1A3E5E; border-bottom-color:transparent; color:#000;}
@@ -237,13 +237,13 @@ a, button {outline:none !important; text-decoration:none !important;}
237 237
 #ITP_CONTAINER .itp_adv_srh .form-group .date .form-control:last-child {border-top-left-radius:0px; border-bottom-left-radius:0px;}
238 238
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk {margin-top:5px;}
239 239
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk .itp_check {float:right; margin-left:10px;}
240
-#ITP_CONTAINER .itp_detail {display:table-cell; vertical-align:top; height:100%;}
240
+#ITP_CONTAINER .itp_detail {display:table-cell; vertical-align:top; height:100%; padding-top:10px;}
241 241
 
242
-#ITP_CONTAINER .itp_detail .itp_det_head {padding:0 4px 0 4px; height:42px; background:#fff;}
243
-#ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:15px; margin:0; padding:0; line-height:42px;}
242
+#ITP_CONTAINER .itp_detail .itp_det_head {padding:0 50px 0 35px; height:42px; background:#fff;}
243
+#ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:20px; margin:0; padding:0; line-height:42px;}
244 244
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit .glyphicon {color:#F0831E; margin-right:4px;}
245 245
 
246
-#ITP_CONTAINER .itp_detail .itp_det_in {padding:15px 20px 15px 20px; height:calc(100vh - 127px); overflow-y:scroll;}
246
+#ITP_CONTAINER .itp_detail .itp_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 127px); overflow-y:scroll;}
247 247
 #ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px;}
248 248
 #ITP_CONTAINER .itp_detail .itp_cicon .btn-default {color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
249 249
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store {display:inline-block; vertical-align:middle; font-size:13px; margin-right:10px;}
@@ -301,7 +301,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
301 301
 
302 302
 #ITP_CONTAINER .itp_detail .itp_lg_form {padding-top:10px;}
303 303
 #ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 {padding-left:15px; padding-right:15px; padding-bottom:15px; }
304
-#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:15px 15px 5px 10px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
304
+#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:20px 20px 10px 20px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
305 305
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-group {margin-bottom:10px;}
306 306
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-control {font-size:13px; color:#333;}
307 307
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_lb {font-size:13px; padding-top:5px; padding-right:0; color:#333; position:relative;}

+ 3 - 5
src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -1029,8 +1029,6 @@ td.menu_text {
1029 1029
 }
1030 1030
 .ui-jqgrid input[type=checkbox] {width:15px; height:15px;}
1031 1031
 
1032
-.ui-jqgrid .jqgrid-rownum {background:#fff !important;}
1033
-.ui-jqgrid .jqgrid-rownum:nth-child(even) {background:#f5f5f5 !important;}
1034
-.table>tbody>tr.success .jqgrid-rownum {background:#dff0d8 !important;}
1035
-.table>tbody>tr.success .jqgrid-rownum:checked {background:#dff0d8 !important;}
1036
-.table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important;}
1032
+.ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
1033
+.table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
1034
+.table>tbody>tr.success .jqgrid-rownum {background:#dff0d8 !important;}

+ 13 - 12
src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -89,7 +89,7 @@ const gridColModel = {
89 89
 		{
90 90
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
91 91
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm,		// 반품사유구분
92
-			width: '10', fixed: false, align: 'center',
92
+			width: '9', fixed: false, align: 'center',
93 93
 			sortable: false, hidden: false
94 94
 		},
95 95
 		{
@@ -154,10 +154,10 @@ let pageObj = {
154 154
 			// 조회일자 지정	
155 155
 			var now = new Date();
156 156
 			var defaultToDate = new Date(now);
157
-			defaultToDate.setDate(now.getDate() + 10);
157
+			defaultToDate.setDate(now.getDate() + 7);
158 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');
159
+			$('#ITP_FORM_COLLMNG03010_SEARCH_FROM_DT').datepicker('setDate', now);
160
+			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
161 161
 		},
162 162
 		grid: function() {
163 163
 			itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');
@@ -199,7 +199,13 @@ let pageObj = {
199 199
             fn_show_btn_auth_array(['#ITP_BTN_COLLMNG03010_SRH', '#ITP_BTN_COLLMNG03010_NEWREG']);
200 200
             $('#ITP_AJAX_COLLMNG03010_LIST_CONTAINER').show();
201 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'));
202
+            if(fn_make_user_info.get('spplyId').length != 0){
203
+            	$('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
204
+            } else {
205
+            	$('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('userId'));
206
+            }
207
+            $('#ITP_BTN_COLLMNG03010_SRH').show();
208
+            $('#ITP_BTN_COLLMNG03010_PRINT').show();
203 209
             $('#ITP_BTN_COLLMNG03010_SEARCH_WHS_ID').show();
204 210
             $('#ITP_BTN_COLLMNG03010_DELETE_WHS_ID').show();
205 211
         }
@@ -221,7 +227,8 @@ let pageObj = {
221 227
 			selRowData = $(COLLMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
222 228
 		}
223 229
 		const key = {brandId: selRowData.brandId, colPickUnqNo: selRowData.colPickUnqNo};		// popup key 값 설정
224
-		fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
230
+		console.log(key);
231
+		fn_call_popup('biz', 'BIZPOP_COL_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
225 232
 	}
226 233
 };
227 234
 
@@ -240,8 +247,6 @@ let listObj = {
240 247
 			let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
241 248
 			param.gridSize = $.jgrid.defaults.rowNum;
242 249
             param.gridPage = $.jgrid.defaults.page;
243
-            param.sbrandId = 'BRD221100002';
244
-            param.sspplyId = 'SPY221100004';
245 250
             console.log(1234);
246 251
             console.log(JSON.stringify(param));
247 252
             $(COLLMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
@@ -260,8 +265,6 @@ let listObj = {
260 265
 		push: function() {
261 266
             let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
262 267
             listObj.itp_COLLMNG03010_param = param;
263
-            param.sbrandId = 'BRD221100002';
264
-            param.sspplyId = 'SPY221100004';
265 268
         },
266 269
         back: function() {
267 270
             $('#ITP_FORM_COLLMNG03010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG03010_param.brandType);
@@ -284,8 +287,6 @@ let listObj = {
284 287
 		load: function() {
285 288
             let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
286 289
             param.gridSize = $.jgrid.defaults.rowNum;
287
-            param.sbrandId = 'BRD221100002';
288
-            param.sspplyId = 'SPY221100004';
289 290
             console.log(JSON.stringify(param));
290 291
             var option = {
291 292
             	gridId: COLLMNG03010_GRID_ID,

+ 1 - 0
src/main/webapp/js/app/config.js

@@ -1644,6 +1644,7 @@ function itp_fn_grid_make_remote(option) {
1644 1644
 		mtype: 'POST',
1645 1645
 		multiselect: false,
1646 1646
 		rownumbers: true,
1647
+		
1647 1648
 		ondblClickRow: null,
1648 1649
 		loadBeforeSend: function(jqXHR) {
1649 1650
 			jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);

+ 396 - 87
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -1,6 +1,6 @@
1 1
 require(['config'], function() {
2 2
 	require([], function($) {
3
-		listObj.init();
3
+		pageObj.init();
4 4
 	});
5 5
 });
6 6
 
@@ -11,9 +11,8 @@ require(['config'], function() {
11 11
  * const gridColModel = {}	: 화면 Grid Object			*
12 12
  * let pageObj = {}			: 화면공통 Object			*
13 13
  * let listObj = {}			: 목록화면 Object			*
14
- * let viewObj = {}			: 상세화면 Object			*
15 14
  * let modifyObj = {}		: 수정화면 Object			*
16
- * let createObj = {}		: 신규화면 Object			*
15
+ 
17 16
  *******************************************************/
18 17
 
19 18
 /*화면 변수*/
@@ -22,17 +21,158 @@ const INOUTMNG01010_GRID_LIST = '#ITP_INOUTMNG01010_jqGrid_list';
22 21
 const INOUTMNG01010_GRID_PAGER = '#ITP_INOUTMNG01010_jqGridPager';
23 22
 const INOUTMNG01010_GRID_EMPTY = '#ITP_INOUTMNG01010_jqGridEmpty';
24 23
 
25
-let ITP_FORM_INOUTMNG01010_DETAIL_IS_WRITING = false;
26
-let INOUTMNG01010_LAST_ROW_ID;
24
+const INOUTMNG01010_DETAIL_GRID_ID = '#ITP_INOUTMNG01010_DETAIL_jqGrid';
25
+const INOUTMNG01010_DETAIL_GRID_LIST = '#ITP_INOUTMNG01010_DETAIL_jqGrid_list';
26
+const INOUTMNG01010_DETAIL_GRID_PAGER = '#ITP_INOUTMNG01010_DETAIL_jqGridPager';
27
+const INOUTMNG01010_DETAIL_GRID_EMPTY = '#ITP_INOUTMNG01010_DETAIL_jqGridEmpty';
28
+
29
+
30
+//let ITP_FORM_INOUTMNG01010_DETAIL_IS_WRITING = false;
31
+let INOUTMNG01010_GRID_LAST_ROW_ID;
27 32
 
28 33
 
29 34
 /*API URL*/
30 35
 let API_DETAIL_GRID_LIST = '/api/pomng/inoutmng/target-grid-list';	// 목록
31
-
36
+let API_DETAIL_SAVE 	 = '/api/pomng/inoutmng/save-inst-shmt';			// 출하지시
32 37
 
33 38
 /*화면 Grid ColModel*/
34 39
 const gridColModel = {
35 40
 	list: [
41
+		{
42
+			index: 'BRAND_ID', name: 'brandId',
43
+			label: ITP_MSG_LOCALE.label.brandId, //브랜드아이디
44
+			width: '13', fixed: false, align: 'center',
45
+			sortable: false, hidden: true
46
+		},
47
+		{
48
+			index: 'BRAND_NM', name: 'brandNm',
49
+			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
50
+			width: '10', fixed: false, align: 'center',
51
+			sortable: false, hidden: false
52
+		},
53
+		{
54
+			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
55
+			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
56
+			width: '10', fixed: false, align: 'center',
57
+			sortable: false, hidden: false
58
+		},
59
+		{
60
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
61
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, //구매발주항번
62
+			width: '10', fixed: false, align: 'center',
63
+			sortable: false, hidden: false
64
+		},
65
+		{
66
+			index: 'ITEM_ID', name: 'itemId',
67
+			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
68
+			width: '10', fixed: false, align: 'center',
69
+			sortable: false, hidden: false
70
+		},
71
+		{
72
+			index: 'ITEM_NM', name: 'itemNm',
73
+			label: ITP_MSG_LOCALE.label.itemNm, //품목명
74
+			width: '10', fixed: false, align: 'left',
75
+			sortable: false, hidden: false
76
+		},
77
+		{
78
+			index: 'WHS_ID', name: 'whsId',
79
+			label: ITP_MSG_LOCALE.label.whsId, //납품창고아이디
80
+			width: '13', fixed: false, align: 'center',
81
+			sortable: false, hidden: true
82
+		},
83
+		{
84
+			index: 'WHS_NM', name: 'whsNm',
85
+			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
86
+			width: '15', fixed: false, align: 'left',
87
+			sortable: false, hidden: false
88
+		},
89
+		{
90
+			index: 'LOCATION', name: 'location',
91
+			label: ITP_MSG_LOCALE.label.location, //납품LOCATION
92
+			width: '15', fixed: false, align: 'center',
93
+			sortable: false, hidden: true
94
+		},
95
+		{
96
+			index: 'UNIT_AMT', name: 'unitAmt',
97
+			label: ITP_MSG_LOCALE.label.unitAmt, //단가
98
+			width: '6', fixed: false, align: 'right',
99
+			sortable: false, hidden: false,
100
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
101
+		},
102
+		{
103
+			index: 'PODR_QTY', name: 'podrQty',
104
+			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
105
+			width: '10', fixed: false, align: 'right',
106
+			sortable: false, hidden: false,
107
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
108
+		},
109
+		{
110
+			index: 'SHMT_QTY', name: 'shmtQty',
111
+			label: ITP_MSG_LOCALE.label.shmtQty, //출고수량
112
+			width: '10', fixed: false, align: 'right',
113
+			sortable: true, editable: false, edittype: 'text',
114
+			hidden: true
115
+		},
116
+		{
117
+			index: 'STCK_QTY', name: 'stckQty',
118
+			label: ITP_MSG_LOCALE.label.stckQty, //현 재고
119
+			width: '10', fixed: false, align: 'right',
120
+			sortable: false, hidden: false,
121
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
122
+		},
123
+		{
124
+			index: 'EXPRY_YN', name: 'expryYn',
125
+			label: ITP_MSG_LOCALE.label.expryYn, //유통기한여부
126
+			width: '10', fixed: false, align: 'center',
127
+			sortable: false, hidden: false
128
+		},
129
+		{
130
+			index: 'EXPRY_PERIOD', name: 'expryPeriod',
131
+			label: ITP_MSG_LOCALE.label.expryPeriod, //유통기한기간
132
+			width: '10', fixed: false, align: 'center',
133
+			sortable: false, hidden: true
134
+		},
135
+		{
136
+			index: 'EXPRY_DATE', name: 'expryDate',
137
+			label: ITP_MSG_LOCALE.label.expryDate, //유통일자
138
+			width: '20', fixed: false, align: 'center',
139
+			sortable: false, hidden: true,
140
+			editable: false, sorttype: "date",
141
+			editoptions: { dataInit: function(e) { $(e).datepicker(ITP_DATE_LANGUAGE); } }
142
+		},
143
+		{
144
+			index: 'PODR_AMT', name: 'podrAmt',
145
+			label: ITP_MSG_LOCALE.label.podrAmt, //발주금액
146
+			width: '10', fixed: false, align: 'right',
147
+			sortable: false, hidden: false,
148
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
149
+		},
150
+		{
151
+			index: 'DLV_REQ_DT', name: 'dlvReqDt',
152
+			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
153
+			width: '10', fixed: false, align: 'center',
154
+			sortable: false, hidden: false
155
+		},
156
+		{
157
+			index: 'SHMT_WHS_ID', name: 'shmtWhsId',
158
+			label: ITP_MSG_LOCALE.label.shmtWhsId, //출고창고아이디
159
+			width: '10', fixed: false, align: 'right',
160
+			sortable: false, hidden: true
161
+		},
162
+		{
163
+			index: 'SHMT_LOCATION', name: 'shmtLocation',
164
+			label: ITP_MSG_LOCALE.label.shmtLocation, //출고LOCATION
165
+			width: '10', fixed: false, align: 'center',
166
+			sortable: false, hidden: true
167
+		},
168
+		{
169
+			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
170
+			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
171
+			width: '10', fixed: false, align: 'center',
172
+			sortable: false, hidden: false
173
+		}
174
+	],
175
+	detail: [
36 176
 		{
37 177
 			index: 'BRAND_ID', name: 'brandId',
38 178
 			label: ITP_MSG_LOCALE.label.brandId, //브랜드아이디
@@ -170,68 +310,53 @@ const gridColModel = {
170 310
 	]
171 311
 };
172 312
 
173
-
174
-
175
-/*목록화면 Object*/
176
-let listObj = {
177
-	init: function() {
178
-		this.view();
179
-		this.action();
313
+/*화면공통 Object*/
314
+let pageObj = {
315
+	init: function () {
316
+		this.ui.init();
180 317
 		this.event.init();
181
-		this.grid.init();
182
-	},
183
-	view: function() {
184
-		// 버튼 권한설정
185
-		fn_proc_btn_auth('INOUTMNG01010');
186
-
187
-		// 공통코드 표시
188
-		$('select').each(function() {
189
-			if ($(this).data('select-code')) {
190
-				fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
191
-			}
192
-		});
193
-
194
-		var now = new Date();
195
-		$('#ITP_TAB_INOUTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
196
-		$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
197
-		$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
198
-
199
-
318
+		this.action();
200 319
 	},
201
-	itp_INOUTMNG01010_search: false,
202
-	button: {
203
-		search: function() {
204
-			console.log("search event");
205
-			listObj.itp_INOUTMNG01010_search = true;
206
-			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
207
-			param.gridSize = $.jgrid.defaults.rowNum;
208
-			param.gridPage = $.jgrid.defaults.page;
209
-			param.sbrandId = fn_make_user_info.get('brandId');
210
-			$(INOUTMNG01010_GRID_ID).setGridParam({ 'postData': JSON.stringify(param) }).trigger('reloadGrid');
320
+	ui: {
321
+		init: function () {
322
+			this.view();
323
+			this.grid();
324
+			this.ready();
211 325
 		},
212
-		shmtout: function() {
213
-
214
-			console.log("search event");
215
-			listObj.itp_INOUTMNG01010_search = true;
216
-			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
217
-			param.gridSize = $.jgrid.defaults.rowNum;
218
-			param.gridPage = $.jgrid.defaults.page;
219
-			param.sbrandId = fn_make_user_info.get('brandId');
220
-			$(INOUTMNG01010_GRID_ID).setGridParam({ 'postData': JSON.stringify(param) }).trigger('reloadGrid');
221
-
326
+		view: function() {
327
+			// 버튼 권한설정
328
+			fn_proc_btn_auth('INOUTMNG01010');
329
+
330
+			// 공통코드 표시
331
+			$('select').each(function() {
332
+				if($(this).data('select-code')) {
333
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
334
+				}
335
+			});
222 336
 
337
+			// 조회일자 지정
338
+			var now = new Date();
339
+			$('#ITP_TAB_INOUTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
340
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
341
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 30)));
342
+		},
343
+		grid: function() {
344
+			itp_fn_jqgrid_resize(INOUTMNG01010_GRID_ID, INOUTMNG01010_GRID_LIST, 'lg');
345
+			listObj.empty.init();
346
+			itp_fn_fire_window_resize();
347
+		},
348
+		ready: function() {
349
+			listObj.init();
223 350
 		}
224 351
 	},
225
-	action: function() {
352
+	action: function () {
226 353
 		var _this = this;
227 354
 		// 출하창고 조회 버튼 클릭
228 355
 		$('#ITP_FORM_INOUTMNG01010_SEARCH_SHMT_WHS_NM').on('click', function() {
229
-			console.log("=================================");
230 356
 			_this.popup('S');
231 357
 		});
232 358
 		// 출하창고 텍스트 삭제 버튼 클릭
233 359
 		$('#ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM').on('click', function() {
234
-			console.log("=================================");
235 360
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM').val('');
236 361
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID').val('');
237 362
 
@@ -239,18 +364,15 @@ let listObj = {
239 364
 
240 365
 		// 납품장소 조회 버튼 클릭
241 366
 		$('#ITP_FORM_INOUTMNG01010_SEARCH_WHS_NM').on('click', function() {
242
-			console.log("=================================");
243 367
 			_this.popup('W');
244 368
 		});
245 369
 		// 납품장소 텍스트 삭제 버튼 클릭
246 370
 		$('#ITP_FORM_INOUTMNG01010_DELETE_WHS_NM').on('click', function() {
247
-			console.log("=================================");
248 371
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM').val('');
249 372
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID').val('');
250 373
 		});
251
-
252 374
 	},
253
-	popup: function(arg) {
375
+	popup: function (arg) {
254 376
 		var popFn;
255 377
 		// 팝업
256 378
 		if (arg == "S") {
@@ -272,11 +394,11 @@ let listObj = {
272 394
 
273 395
 
274 396
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
275
-
397
+		
398
+		
276 399
 	},
277 400
 	callback: {
278 401
 		shmtwhs: function(rowDataPop) {
279
-			console.log(rowDataPop);
280 402
 			if (rowDataPop) {
281 403
 				$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM').val(rowDataPop.whsNm);
282 404
 				$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID').val(rowDataPop.whsId);
@@ -284,7 +406,6 @@ let listObj = {
284 406
 
285 407
 		},
286 408
 		whs: function(rowDataPop) {
287
-			console.log(rowDataPop);
288 409
 			if (rowDataPop) {
289 410
 				$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
290 411
 				$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
@@ -293,33 +414,145 @@ let listObj = {
293 414
 		}
294 415
 	},
295 416
 	event: {
296
-		init: function() {
417
+		init: function () {
297 418
 			this.button();
298 419
 		},
299
-		button: function() {
420
+		button: function () {
300 421
 			// 버튼 클릭 이벤트
301 422
 			$('button').each(function() {
302 423
 				var id = $(this).attr('id');
303 424
 				$(this).on('click', function() {
304
-					console.log("button");
305
-					console.log(id);
306 425
 					switch (id) {
307
-						case 'ITP_BTN_INOUTMNG01010_SRH': listObj.button.search(); break;	// 조회 버튼 클릭
308
-						case 'ITP_BTN_INOUTMNG01010_OUT': listObj.button.shmtout(); break;	// 출하지시 버튼
309
-
426
+						case 'ITP_BTN_INOUTMNG01010_SRH'				: listObj.button.search();			break;	// 조회 버튼 클릭
427
+						case 'ITP_BTN_INOUTMNG01010_OUC'				: listObj.button.shmtcreat();		break;	// 출하생성 버튼
428
+						case 'ITP_BTN_INOUTMNG01010_OUT'				: modifyObj.button.save(); 			break;	// 출하지시 버튼
429
+						case 'ITP_BTN_INOUTMNG01010_CANCELLIST'			: modifyObj.button.cancel(); 		break;	// 취소/목록 버튼
310 430
 					}
311 431
 				});
312 432
 			});
313
-
433
+			
314 434
 			$('body').on('click', function(e) {
315
-				var gridId = INOUTMNG01010_GRID_ID.replace('#', '');
316
-				var rids = $(INOUTMNG01010_GRID_ID).jqGrid('getDataIDs');
435
+				
436
+				var gridId = (INOUTMNG01010_DETAIL_GRID_ID).replace('#', '');
437
+				var rids = $(INOUTMNG01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
317 438
 				var last_row_id = rids[rids.length - 1];
318
-
319
-				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'INOUTMNG01010');
439
+				
440
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'INOUTMNG01010_DETAIL');	
320 441
 			});
321 442
 
443
+		}
444
+	},
445
+	switchScreen: function(mode) {
446
+		$('.itp_det_head').find('button[id^="ITP_BTN_INOUTMNG01010_"]').each(function(i) {
447
+			$(this).hide();
448
+		});
449
+		$('#ITP_TAB_INOUTMNG01010').find('div[id$="_CONTAINER"]').each(function(i) {
450
+			$(this).hide();
451
+		});
452
+		if(mode == 'LIST') { // 목록
453
+			$('#ITP_AJAX_INOUTMNG01010_LIST_CONTAINER').show();
454
+			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_SRH', '#ITP_BTN_INOUTMNG01010_OUC']);
455
+			$('#ITP_FORM_INOUTMNG01010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
456
+		} else if(mode == 'DETAIL') { // 출하지시 상세
457
+			$('#ITP_AJAX_INOUTMNG01010_DETAIL_CONTAINER').show();
458
+			fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG01010_OUT', '#ITP_BTN_INOUTMNG01010_CANCELLIST']);
459
+			$('#ITP_FORM_INOUTMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
460
+			
461
+			//pageObj.grid.init(param);
462
+		} 
463
+	},
464
+	grid: {
465
+		init: function(param) {
466
+			this.gridId = INOUTMNG01010_DETAIL_GRID_ID;
467
+			this.gridList = INOUTMNG01010_DETAIL_GRID_LIST;
468
+			this.gridEmpty = INOUTMNG01010_DETAIL_GRID_EMPTY;
469
+			var now = new Date();
470
+			$('#ITP_TAB_INOUTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
471
+			$('#ITP_FORM_INOUTMNG01010_DETAIL_DLV_SCH_DT').datepicker('setDate', new Date(param.dlvSchDt));
472
+			$('#ITP_FORM_INOUTMNG01010_DETAIL .fnBrandNm').text(param.brandNm);
473
+			
474
+			this.gridRows = param.recordData;
475
+			this.unload();
476
+			this.load(param.recordData);
477
+			
478
+		},
479
+		gridId: '',
480
+		button: {},
481
+		gridList: '',
482
+		gridEmpty: '',
483
+		gridRows: '',
484
+		load: function(gridRows) {
485
+			
486
+			var _this = this;
487
+			var option = {
488
+				gridId: _this.gridId,
489
+				colModel: gridColModel.detail,
490
+				data: gridRows,
491
+				loadComplete: function(data) {
492
+					$(INOUTMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
493
+					data.records === 0 ? _this.clearData(mode) : $(INOUTMNG01010_DETAIL_GRID_EMPTY).hide();
494
+					
495
+				},
496
+				onCellSelect: function(rowid, cellIdx, cellValue) {
497
+					INOUTMNG01010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, INOUTMNG01010_GRID_LAST_ROW_ID, _this.gridId, ['pchReqDtlNo']);
498
+				}
499
+			};
500
+			itp_fn_grid_make_local(option);
501
+		},
502
+		clearData : function(mode) {
503
+			$(INOUTMNG01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
504
+			$(INOUTMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
505
+			$(INOUTMNG01010_DETAIL_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
506
+			$(INOUTMNG01010_DETAIL_GRID_EMPTY).show();
507
+		},
508
+		unload : function() {
509
+			$.jgrid.gridUnload(this.gridId);
510
+		}
511
+	}
512
+};
322 513
 
514
+/*목록화면 Object*/
515
+let listObj = {
516
+	init: function () {
517
+		this.grid.init();
518
+	},
519
+	itp_INOUTMNG01010_search: false,
520
+	button: {
521
+		search: function() {
522
+			listObj.itp_INOUTMNG01010_search = true;
523
+			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
524
+			param.gridSize = $.jgrid.defaults.rowNum;
525
+			param.gridPage = $.jgrid.defaults.page;
526
+			$(INOUTMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
527
+		},
528
+		shmtcreat: function() {
529
+			//선택되어진 row 값 전송할예정
530
+			let gridUpdateData = [];
531
+			const rowKey = $(INOUTMNG01010_GRID_ID).getGridParam('selrow');
532
+			if (!rowKey) {
533
+				return;
534
+		    }
535
+
536
+			var selectedIds = $(INOUTMNG01010_GRID_ID).getGridParam('selarrrow');
537
+			
538
+			var brandNm = "";
539
+			var maxDlvSchDt = "";
540
+			
541
+			for (var i=selectedIds.length-1; i>=0; i--) {
542
+				var rowData = $(INOUTMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
543
+				
544
+				gridUpdateData.push(rowData);	
545
+				if (rowData.dlvReqDt > maxDlvSchDt) {
546
+					maxDlvSchDt = rowData.dlvReqDt;
547
+				}
548
+				sbrandNm =rowData.brandNm;
549
+			}
550
+			
551
+			let param = {brandNm: sbrandNm, dlvSchDt: maxDlvSchDt };
552
+			param.recordData = gridUpdateData;
553
+			pageObj.switchScreen('DETAIL');
554
+			itp_fn_form_clear_validate(null, '#ITP_FORM_INOUTMNG01010_DETAIL');
555
+			pageObj.grid.init(param);
323 556
 		}
324 557
 	},
325 558
 	empty: {
@@ -329,7 +562,7 @@ let listObj = {
329 562
 			$(INOUTMNG01010_GRID_EMPTY).on('click', function() {
330 563
 				_this.back();
331 564
 				_this.itp_INOUTMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
332
-				$(INOUTMNG01010_GRID_ID).setGridParam({ 'postData': JSON.stringify(_this.itp_INOUTMNG01010_param) }).trigger('reloadGrid');
565
+				$(INOUTMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_INOUTMNG01010_param)}).trigger('reloadGrid');
333 566
 			});
334 567
 		},
335 568
 		itp_INOUTMNG01010_param: {},
@@ -341,43 +574,39 @@ let listObj = {
341 574
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').val(this.itp_INOUTMNG01010_param.fromDt);
342 575
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').val(this.itp_INOUTMNG01010_param.toDt);
343 576
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID').val(this.itp_INOUTMNG01010_param.sshmtWhsId);
577
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM').val(this.itp_INOUTMNG01010_param.sshmtWhsNm);
578
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM').val(this.itp_INOUTMNG01010_param.swhsNm);
344 579
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID').val(this.itp_INOUTMNG01010_param.swhsId);
345 580
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM').val(this.itp_INOUTMNG01010_param.sItemNm);
346 581
 		}
347 582
 	},
348 583
 	grid: {
349
-		init: function() {
584
+		init: function () {
350 585
 			// 데이터 없을때
351 586
 			listObj.empty.push();
352 587
 			itp_fn_jqgrid_resize(INOUTMNG01010_GRID_ID, INOUTMNG01010_GRID_LIST, 'lg');
353 588
 			itp_fn_fire_window_resize();
354 589
 			this.search();
355
-
590
+			
356 591
 		},
357 592
 		colModel: gridColModel.list,
358 593
 		search: function() {
594
+			pageObj.switchScreen('LIST');
359 595
 			this.unload();
360 596
 			this.load();
361 597
 		},
362 598
 		load: function() {
363 599
 			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
364 600
 			param.gridSize = $.jgrid.defaults.rowNum;
365
-			param.sbrandId = fn_make_user_info.get('brandId');
366
-
601
+			
367 602
 			var option = {
368 603
 				multiselect: true,
369 604
 				autowidth: true,
370
-				//cellEdit: true,
371 605
 				gridId: INOUTMNG01010_GRID_ID,
372 606
 				colModel: gridColModel.list,
373
-				//viewrecords:false,
374 607
 				param: param,
375 608
 				url: DOMAIN + API_DETAIL_GRID_LIST,
376 609
 				pager: INOUTMNG01010_GRID_PAGER,
377
-
378
-				onCellSelect: function(rowid, cellIdx, cellValue) {
379
-					INOUTMNG01010_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, INOUTMNG01010_LAST_ROW_ID, INOUTMNG01010_GRID_ID, ['pchPodrUnqNo']);
380
-				},
381 610
 				loadComplete: function(data) {
382 611
 					itp_fn_grid_load_complete(data, INOUTMNG01010_GRID_ID, true, 'number', 'INOUTMNG01010', listObj.itp_INOUTMNG01010_search, listObj.empty, true, data.gridRecords, true);
383 612
 				},
@@ -389,10 +618,10 @@ let listObj = {
389 618
 		},
390 619
 		button: {
391 620
 		},
392
-		unload: function() {
621
+		unload : function() {
393 622
 			$.jgrid.gridUnload(INOUTMNG01010_GRID_ID);
394 623
 		},
395
-		clearData: function() {
624
+		clearData : function() {
396 625
 			$(INOUTMNG01010_GRID_ID).jqGrid('clearGridData', true);
397 626
 			$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
398 627
 			$(INOUTMNG01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
@@ -401,4 +630,84 @@ let listObj = {
401 630
 	}
402 631
 };
403 632
 
633
+/*수정화면 Object*/
634
+let modifyObj = {
635
+	init: function (param) {
636
+		this.load(param);
637
+	},
638
+	button: {
639
+		modify: function (param) {
640
+			itp_fn_form_clear_validate(null, '#ITP_FORM_INOUTMNG01010_DETAIL');
641
+			//const selectVal = $('#ITP_FORM_INOUTMNG01010_VIEW_STORE_ID').val();
642
+			//const key = {brandId:fn_make_user_info.get('brandId'), storeId: selectVal, viewCd: 'R'};
643
+			//var param = $.param(key);
644
+			//modifyObj.load(param);
645
+		},
646
+		cancel: function() {
647
+			document.getElementById('ITP_FORM_INOUTMNG01010_DETAIL').reset();
648
+			listObj.grid.search();
649
+		},
650
+		save: function() {
651
+			$('body').trigger('click');
652
+			const formId = ('#ITP_FORM_INOUTMNG01010_DETAIL');
653
+			itp_fn_form_clear_validate(null, formId);
654
+
655
+			if (itp_fn_form_event.isValid(formId)) {
656
+				
657
+				var modalFn = {
658
+					callBack: () => {
659
+						itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
660
+						var chkQtyYn = "N";
661
+						let gridInsertData = [];
662
+						const rowData = $(INOUTMNG01010_DETAIL_GRID_ID).getRowData();
663
+						
664
+						$.each(rowData, function(key, value) {
665
+							
666
+							if (value.shmtQty == '' || value.shmtQty < 1 ) {
667
+								alert("출고수량을 입력해주세요!");
668
+								chkQtyYn = "Y";
669
+								return false;
670
+							}
671
+							
672
+							if (value.stckQty < valus.shmtQty) {
673
+								alert("출고지시할 수량이 부족합니다.");
674
+								chkQtyYn = "Y";
675
+								return false;
676
+							}
677
+							
678
+							
679
+							if (value.podrQty > value.shmtQty ) {
680
+								 alert("출고수량이 발주수량보다 클수 없습니다!");
681
+								chkQtyYn = "Y";
682
+								return false;
683
+							}
684
+							
685
+							gridInsertData.push(value);
686
+						});
687
+						
688
+						if (chkQtyYn == "Y") return;
689
+						
690
+						let param = $(formId).serializeObject();
691
+						param.viewCd = "C";
692
+						param.gridInsertData = gridInsertData;
693
+						console.log(JSON.stringify(param));
694
+						var searhFn = function () {
695
+							//ITP_FORM_INOUTMNG01010_DETAIL_IS_WRITING = false;
696
+							pageObj.grid.clearData();
697
+							modifyObj.button.cancel();
698
+						}
699
+						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
700
+					}
701
+				};
702
+				itp_fn_modal_confirm('출하지시 하시겠습니까?', modalFn);
703
+			}
704
+		}
705
+	},
706
+	
707
+	load: function(param) {
708
+		//console.log(param);
709
+		//pageObj.grid.load("DETAIL",param);
710
+	}
711
+};
712
+
404 713
 

+ 1 - 1
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -427,7 +427,7 @@ let listObj = {
427 427
 					}
428 428
 				},
429 429
 				loadComplete: function(data) {
430
-					$("tr.jqgrow:odd").css("background", "#f5f5f5");
430
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
431 431
 					console.log(data);
432 432
 					itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', listObj.itp_OPER01010_search, _this.itp_fn_OPER01010_empty, true, data.gridRecords, true);
433 433
 					var ids = $(OPER01010_GRID_ID).getDataIDs();

+ 1 - 0
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -442,6 +442,7 @@ let listObj = {
442 442
 					}
443 443
 				},
444 444
 				loadComplete: function(data) {
445
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
445 446
 					console.log(data);
446 447
 					itp_fn_grid_load_complete(data, OPER02010_GRID_ID, true, 'number', 'OPER02010', listObj.grid.itp_OPER02010_search, _this.itp_fn_OPER02010_empty, true, data.gridRecords, true);
447 448
 					var ids = $(OPER02010_GRID_ID).getDataIDs();

+ 1 - 0
src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -428,6 +428,7 @@ let listObj = {
428 428
 					}
429 429
 				},
430 430
 				loadComplete: function(data) {
431
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
431 432
 					console.log(data);
432 433
 					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', pageObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
433 434
 					var ids = $(OPER03010_GRID_ID).getDataIDs();

+ 1 - 0
src/main/webapp/js/app/oper/ITP_OPER04010.js

@@ -247,6 +247,7 @@ let listObj = {
247 247
                     }
248 248
                 },
249 249
                 loadComplete: function(data) {
250
+                	$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
250 251
                     // console.log(data);
251 252
                     itp_fn_grid_load_complete(data, OPER04010_GRID_ID, true, 'number', 'OPER04010', listObj.itp_OPER04010_search, listObj.empty, true, data.gridRecords, true);
252 253
                     var ids = $(OPER04010_GRID_ID).getDataIDs();

+ 1 - 0
src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -337,6 +337,7 @@ let listObj = {
337 337
                     }
338 338
                 },
339 339
                 loadComplete: function(data) {
340
+                	$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경ㄴ
340 341
                     console.log(data);
341 342
                     itp_fn_grid_load_complete(data, OPER06010_GRID_ID, true, 'number', 'OPER06010', listObj.itp_OPER06010_search, listObj.empty, true, data.gridRecords, true);
342 343
                     var ids = $(OPER06010_GRID_ID).getDataIDs();

+ 47 - 46
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_COL_STTMT_PRN.js

@@ -6,34 +6,34 @@ require(['config'], function() {
6 6
 	});
7 7
 });
8 8
 
9
-let API_POP_INV_INFO = '/api/pomng/inoutmng/info-inv';
9
+let API_POP_INV_INFO = '/api/rtnmng/inoutmng/info-pick';
10 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';
11
+const THIS_FORM_ID = '#ITP_FORM_BIZPOP_COL_STTMT_PRN';
12
+const THIS_GIRD_ID = '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid';
13
+const THIS_GIRD_LIST = '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list';
14
+const THIS_GIRD_PAGER = '#ITP_BIZPOP_COL_STTMT_PRN_jqGridPager';
15
+const THIS_GIRD_EMPTY = '#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty';
16 16
 
17
-function itp_fn_BIZPOP_COL_PICK_PRN(parentPopFn, args, returnType) {
17
+function itp_fn_BIZPOP_COL_STTMT_PRN(parentPopFn, args, returnType) {
18 18
 	
19 19
 	
20
-	let itp_BIZPOP_COL_PICK_PRN_param = args;
21
-	let itp_BIZPOP_COL_PICK_PRN_search = false;
20
+	let itp_BIZPOP_COL_STTMT_PRN_param = args;
21
+	let itp_BIZPOP_COL_STTMT_PRN_search = false;
22 22
 
23 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);
24
+	$('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(args.brandId);
25
+	$('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val(args.colPickUnqNo);
26 26
 	
27 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', '');
28
+	$('#ITP_BIZPOP_COL_STTMT_PRN').one('shown.bs.modal', function(e) {
29
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list', '');
30 30
 		itp_fn_fire_window_resize();
31 31
 	}).one('hidden.bs.modal', function(e) {
32
-		$('#ITP_BIZPOP_COL_PICK_PRN').remove();
32
+		$('#ITP_BIZPOP_COL_STTMT_PRN').remove();
33 33
 	}).modal('show');
34 34
 
35 35
 
36
-	$('#ITP_BIZPOP_COL_PICK_PRN_BTN_SEARCH').on('click', function() {
36
+	$('#ITP_BIZPOP_COL_STTMT_PRN_BTN_SEARCH').on('click', function() {
37 37
 		//인쇄부분 여기에 추가함
38 38
 	});
39 39
 /*	
@@ -44,23 +44,23 @@ function itp_fn_BIZPOP_COL_PICK_PRN(parentPopFn, args, returnType) {
44 44
 	});
45 45
 */
46 46
 
47
-	$('#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty').on('click', function() {
48
-		itp_fn_BIZPOP_COL_PICK_PRN_empty.back();
47
+	$('#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty').on('click', function() {
48
+		itp_fn_BIZPOP_COL_STTMT_PRN_empty.back();
49 49
 		//itp_BIZPOP_PO_REJECT_param.gridSize = 10;
50
-		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_COL_PICK_PRN_param)}).trigger('reloadGrid');
50
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_COL_STTMT_PRN_param)}).trigger('reloadGrid');
51 51
 	});
52 52
 
53
-	var itp_fn_BIZPOP_COL_PICK_PRN_empty = {
53
+	var itp_fn_BIZPOP_COL_STTMT_PRN_empty = {
54 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;
55
+			let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(), colPickUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val() };
56
+			itp_BIZPOP_COL_STTMT_PRN_param = param;
57 57
 		},
58 58
 		back: function() {
59 59
 		}
60 60
 	};
61 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() };
62
+	itp_fn_BIZPOP_COL_STTMT_PRN_empty.push();
63
+	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(), colPickUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val() };
64 64
 	console.log(JSON.stringify(param));
65 65
 	
66 66
 	const gridColModel = {
@@ -117,8 +117,8 @@ let pageObj = {
117 117
 		fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
118 118
 	},
119 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');
120
+		$('#ITP_BIZPOP_COL_STTMT_PRN_BTN_PRINT').on('click', function (printDiv){
121
+			  var divToPrint=document.getElementById('ITP_BIZPOP_COL_STTMT_PRN_PRINT_AREA');
122 122
 
123 123
 			  var newWin=window.open('','Print-Window');
124 124
 
@@ -136,24 +136,25 @@ let pageObj = {
136 136
 	
137 137
 	callback: function (result) {
138 138
 		console.log(result);
139
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColPickUnqNo').text(result.colPickUnqNo);
140
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColRegDt').text(result.colRegDt);
139
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColPickUnqNo').text(result.colPickUnqNo);
140
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColRegDt').text(result.colRegDt);
141 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);
142
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColSchDt').text(result.colSchDt);
143
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnPickMgrNm').text(result.pickMgrNm);
144
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnWhsAddr').text(result.whsAddr);
145
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnPndrTelNo').text(result.pndrTelNo);
145 146
 		
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);
147
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColBsnsRegno').text(result.colBsnsRegno);
148
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColNm').text(result.colNm);
149
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColOwnerNm').text(result.colOwnerNm);
150
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColAddr').text(result.colAddr);
150 151
 		
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);
152
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnBsnsRegno').text(result.rtnBsnsRegno);
153
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnNm').text(result.rtnNm);
154
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnOwnerNm').text(result.rtnOwnerNm);
155
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnAddr').text(result.rtnAddr);
155 156
 		
156
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnDlvQty').text(result.dlvQty);
157
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnDlvQty').text(result.dlvQty);
157 158
 		
158 159
 		// 품목  리스트 조회
159 160
 		pageObj.grid.init(result.pickDtlInfoList);
@@ -164,9 +165,9 @@ let pageObj = {
164 165
 			this.unload();
165 166
 			this.load(gridRows);
166 167
 		},
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',
168
+		gridId: '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid',
169
+		gridList: '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list',
170
+		gridEmpty: '#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty',
170 171
 		gridRows: '',
171 172
 		load : function(gridRows) {
172 173
 			var _this = this;
@@ -188,13 +189,13 @@ let pageObj = {
188 189
 							{
189 190
 								index: 'ITEM_NM', name: 'itemNm',
190 191
 								label: '품목명', //
191
-								width: '10', fixed: false, align: 'center',
192
+								width: '5', fixed: false, align: 'center',
192 193
 								sortable: false, hidden: false
193 194
 							},
194 195
 							{
195 196
 								index: 'COL_REQ_QTY', name: 'colReqQty',
196 197
 								label: '수거요청수량', //
197
-								width: '5', fixed: false, align: 'center',
198
+								width: '10', fixed: false, align: 'center',
198 199
 								sortable: false, hidden: false
199 200
 							},
200 201
 							{
@@ -219,8 +220,8 @@ let pageObj = {
219 220
 				data: gridRows,
220 221
 				multiselect: false,
221 222
 				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();
223
+					$('#ITP_BIZPOP_COL_STTMT_PRN_jqGrid').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
224
+					data.records === 0 ? _this.clearData() : $('#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty').hide();
224 225
 				},
225 226
 				onCellSelect: function(rowid, cellIdx, cellValue) {
226 227
 				}