입고처리 수정중

src/main/webapp/app/pomng/POMNG04010.html

@@ -35,21 +35,29 @@
 										</div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
-											<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
+						                <div class="col-xs-2 itp_ip itp_noMar">
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
+												<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_POMNG04010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
 											<button type="button" id="ITP_BTN_POMNG04010_SEARCH_SPPLY_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_POMNG04010_DELETE_SPPLY_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-2 itp_ip itp_noMar">
+											<div class="input-group">
 											<input type="text" id="ITP_FORM_POMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="sdlvPlace" placeholder="매장/창고" readonly/>
 											<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />											
+												<span class="input-group-btn">
+													<button id="ITP_BTN_POMNG04010_DELETE_WHS_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
 											<button type="button" id="ITP_BTN_POMNG04010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_POMNG04010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_POMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호 / 품목번호 / 품목명" />
@@ -75,8 +83,7 @@
 								<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
 								<input type="hidden" id="ITP_FORM_POMNG04010_DETAIL_STORE_ID" name="storeId" value="">
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">구매발주상세</h4>
-									<div class="itp_form_in">	
+									<div class="itp_form_in border-top">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
@@ -134,11 +141,11 @@
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
+										<div class="itp_table_head fix" style="background:#fff;">
 											<h4 class="itp_table_tit">발주 품목</h4>
 										</div>
 										<div id="ITP_POMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
-											<div id="ITP_POMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
+											<!-- <div id="ITP_POMNG04010_DETAIL_jqGridView" class="itp_views fix"></div> -->
 											<table id="ITP_POMNG04010_DETAIL_jqGrid"></table>
 											<div id="ITP_POMNG04010_DETAIL_jqGridPager"></div>
 											<div id="ITP_POMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

src/main/webapp/app/pomng/POMNG05010.html

@@ -38,20 +38,28 @@
 											</select>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
-											<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
-										</div>
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
+												<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
+										</div>	
 										<div class="col-xs-1 itp_in" style="padding:0px; width:8%;">
 											<button type="button" id="ITP_BTN_POMNG05010_SEARCH_SPPLY_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
-											<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
+												<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_POMNG05010_DELETE_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-erase"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
 											<button type="button" id="ITP_BTN_POMNG05010_SEARCH_SWHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_POMNG05010_DELETE_SWHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										
 										<div class="col-xs-3 itp_ip itp_noMar">

src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -62,7 +62,7 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			minwidth: 120,
 			sortable: false, hidden: false
 		},

src/main/webapp/js/app/pomng/ITP_POMNG04010.js

@@ -81,7 +81,7 @@ const gridColModel = {
 		{
 			index: 'PODR_ITEM_QTY', name: 'podrItemQty',
 			label: ITP_MSG_LOCALE.label.podrItemQty, 		// 발주품목수
-			width: '7', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
@@ -99,28 +99,22 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		},
-		{
-			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
-			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		// 발주항번
-			width: '5', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
-			width: '5', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
-			width: '5', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, 			// 단가
-			width: '5', fixed: false, align: 'center',
+			width: '3', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
@@ -133,20 +127,26 @@ const gridColModel = {
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: ITP_MSG_LOCALE.label.podrQty, 			// 발주수량
-			width: '5', fixed: false, align: 'center',
+			width: '5', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PODR_AMT', name: 'podrAmt',
 			label: ITP_MSG_LOCALE.label.podrAmt, 			// 발주금액
-			width: '5', fixed: false, align: 'center',
+			width: '5', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'WHS_PASS_QTY', name: 'whsPassQty',
 			label: ITP_MSG_LOCALE.label.whsPassQty, 		// 출고가능수량
-			width: '5', fixed: false, align: 'center',
+			width: '5', fixed: false, align: 'right',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		// 발주항번
+			width: '3', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/pomng/ITP_POMNG05010.js

@@ -39,7 +39,7 @@ const gridColModel = {
 			{
 				index: 'Brand_Nm', name: 'brandNm',			
 				label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
-				width: '20', fixed: false, align: 'center',	
+				width: '20', fixed: false, align: 'left',	
 				minwidth:150,
 				sortable: false, hidden: false					
 			},
@@ -47,21 +47,21 @@ const gridColModel = {
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',	
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		//납품서번호
 				width: '20', fixed: false, align: 'center',	
-				minwidth:120,	
+				minwidth:140,	
 				sortable: false, hidden: false					
 			},
 			{
 				index: 'PODR_REG_DT', name: 'pchPodrUnqNo',	
 				label: '발주번호', 								//발주번호
 				width: '14', fixed: false, align: 'center',	
-				minwidth:120,
+				minwidth:140,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'PODR_REG_DT', name: 'spplyNm',	
 				label: '공급업체', 								//공급업체
-				width: '14', fixed: false, align: 'center',	
-				minwidth:150,
+				width: '14', fixed: false, align: 'left',	
+				minwidth:140,
 				sortable: false, hidden: false				
 			},
 			{
@@ -75,42 +75,42 @@ const gridColModel = {
 				index: 'WHS_NM', name: 'whsNm',				
 				label: '입고처', 			//납품장소
 				width: '20', fixed: false, align: 'center',	
-				minwidth:200,
+				minwidth:220,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'PODR_REG_DT', name: 'podrRegDt',	
 				label: '발주생성일', 							//발주생성일
 				width: '14', fixed: false, align: 'center',	
-				minwidth:80,
+				minwidth:90,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'DLV_REQ_DT', name: 'dlvReqDt',		
 				label: ITP_MSG_LOCALE.label.dlvReqDt, 		//납품요청일
 				width: '14', fixed: false, align: 'center',	
-				minwidth:80,
+				minwidth:90,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'DLV_REG_DT', name: 'dlvRegDt',		
 				label:	'납품생성일', 							//발주생성일
 				width: '14', fixed: false, align: 'center',	
-				minwidth:80,
+				minwidth:90,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'DLV_SCH_DT', name: 'dlvSchDt',		
 				label: ITP_MSG_LOCALE.label.dlvSchDt, 		//납품예정일
 				width: '14', fixed: false, align: 'center',	
-				minwidth:80,
+				minwidth:90,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'DLV_CMPLT_DT', name: 'dlvCmpltDt',	
 				label: '납품완료일', 	//납품완료일
 				width: '10', fixed: false, align: 'center',	
-				minwidth:80,
+				minwidth:90,
 				sortable: false, hidden: false				
 			},
 			{
@@ -123,34 +123,34 @@ const gridColModel = {
 			{
 				index: 'ITEM_NM', name: 'itemNm',			
 				label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
-				width: '10', fixed: false, align: 'center',	
-				minwidth:200,
+				width: '10', fixed: false, align: 'left',	
+				minwidth:180,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'PODR_QTY', name: 'podrQty',			
 				label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
-				width: '6', fixed: false, align: 'center',	
+				width: '6', fixed: false, align: 'right',	
 				minwidth:80,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'DLV_QTY', name: 'dlvQty',			
 				label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
-				width: '6', fixed: false, align: 'center',	
+				width: '6', fixed: false, align: 'right',	
 				minwidth:80,
 				sortable: false, hidden: false				
 			},
 			{
 				index: 'UNIT', name: 'unit',				
 				label: ITP_MSG_LOCALE.label.unit, 			//단가
-				width: '6', fixed: false, align: 'center',	
+				width: '6', fixed: false, align: 'right',	
 				sortable: false, hidden: true				
 			},
 			{
 				index: 'UNIT_AMT', name: 'unitAmt',			
 				label: ITP_MSG_LOCALE.label.unitAmt, 		//단가
-				width: '6', fixed: false, align: 'center',	
+				width: '6', fixed: false, align: 'right',	
 				minwidth:80,
 				sortable: false, hidden: false,
 				formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }				
@@ -158,7 +158,7 @@ const gridColModel = {
 			{
 				index: 'DLV_MGR_NM', name: 'dlvMgrNm',		
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
-				width: '8', fixed: false, align: 'center',	
+				width: '8', fixed: false, align: 'left',	
 				minwidth:100,
 				sortable: false, hidden: false				
 			},
@@ -166,7 +166,7 @@ const gridColModel = {
 				index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',	
 				label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 	//납품담당연락처
 				width: '10', fixed: false, align: 'center',	
-				minwidth:100,
+				minwidth:120,
 				sortable: false, hidden: false				
 			}
 	]
@@ -275,6 +275,8 @@ let pageObj = {
 	screen: function() {
 		$('#ITP_FORM_POMNG05010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));//input hidden 값 넣기				
 		$('#ITP_FORM_POMNG05010_SEARCH_DTL_GUBUN').val('dtlGubun');
+		$('#ITP_BTN_POMNG05010_DELETE_SPPLY_NM').show();
+		$('#ITP_BTN_POMNG05010_DELETE_SWHS_NM').show();
 	}
 };
 

src/main/webapp/js/app/pomng/ITP_POMNG06010.js

@@ -44,30 +44,34 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
 			label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, //납품서번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 130,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
 			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, //납품서항번
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '10', fixed: false, align: 'center',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
@@ -102,13 +106,15 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '6', fixed: false, align: 'right',
+			minwidth: 70,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_ID', name: 'whsId',
 			label: ITP_MSG_LOCALE.label.whsId, //납품창고아이디
-			width: '15', fixed: false, align: 'center',
+			width: '15', fixed: false, align: 'left',
+			minwidth: 150,
 			sortable: false, hidden: true
 		},
 		{
@@ -121,6 +127,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
 			width: '15', fixed: false, align: 'left',
+			minwidth: 140,
 			sortable: false, hidden: false
 		},
 		{
@@ -144,7 +151,8 @@ const gridColModel = {
 		{
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당자연락처
-			width: '15', fixed: false, align: 'left',
+			width: '15', fixed: false, align: 'center',
+			minwidth: 120,
 			sortable: false, hidden: false
 		},
 		{