diff --git a/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp b/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp index 1be877a..58e1b91 100644 --- a/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp @@ -38,6 +38,7 @@ $(document).ready(function(){ var part_type = $.parseJSON($("#part_type").val()); //jqGrid 구분 var acctfg_code = $.parseJSON($("#acctfg_code").val()); //jqGrid 계정구분 var sup_code = $.parseJSON($("#sup_code").val()); //jqGrid 구분 + var unit_dc_code = $("#unit_dc_code").val() ? $.parseJSON($("#unit_dc_code").val()) : {}; //jqGrid 단위 //Excel File Upload된 파일 목록 부분을 초기화 한다. $("#excelImportList").hide(); @@ -187,16 +188,24 @@ $(document).ready(function(){ } } } - ,{name:"UNIT_DC",index:"UNIT_DC", width: 70, align:"center", hidden: false, sortable:false, editable:true + ,{name:"UNIT_DC",index:"UNIT_DC", width: 80, align:"center", hidden: false, sortable:false, editable:true + ,edittype :"select" + ,formatter :"select" ,editoptions:{ - dataInit : function(e){ + value: unit_dc_code + ,dataInit : function(e){ + e.style.width = "92%"; e.style.fontSize = 13; } } } - ,{name:"UNITMANG_DC",index:"UNITMANG_DC", width: 70, align:"center", hidden: false, sortable:false, editable:true + ,{name:"UNITMANG_DC",index:"UNITMANG_DC", width: 80, align:"center", hidden: false, sortable:false, editable:true + ,edittype :"select" + ,formatter :"select" ,editoptions:{ - dataInit : function(e){ + value: unit_dc_code + ,dataInit : function(e){ + e.style.width = "92%"; e.style.fontSize = 13; } } @@ -293,7 +302,7 @@ $(document).ready(function(){ ,height : 530 //'auto' //520 ,multiselect : false ,shrinkToFit : false - ,autowidth : true + ,autowidth : false ,sortable : false ,rowNum : 5000 ,forceFit : false //컬럼의 width를 변화시킬때 그리드의 width를 고정 여부 @@ -1084,6 +1093,7 @@ function fn_save(){ + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp b/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp index 3f7b38d..26a078d 100644 --- a/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp @@ -461,9 +461,19 @@ section { } .plm_btn_wrap_center { flex-direction: row !important; + display: flex !important; + justify-content: center !important; + position: relative !important; + left: auto !important; + transform: none !important; } .plm_btns, .btns { width: auto !important; + float: none !important; + } + .btn_wrap { + padding: 10px 5px !important; + height: auto !important; } } @@ -609,13 +619,13 @@ section { - + - + diff --git a/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp b/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp index 169eed2..d702f16 100644 --- a/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp @@ -293,6 +293,31 @@ function fn_overlapPartMng(){ .input_title {border-left:1px solid #ccc;} .input_sub_title {border-left:1px solid #ccc;} .pmsPopupForm tr:last-child td{border-bottom:1px solid #ccc;} +@media (max-width: 768px) { + .pmsPopupForm td { + display: table-cell !important; + width: auto !important; + } + .input_title { + border-right: 1px solid #ccc !important; + } + .plm_btn_wrap_center { + flex-direction: row !important; + display: flex !important; + justify-content: center !important; + position: relative !important; + left: auto !important; + transform: none !important; + } + .plm_btns, .btns { + width: auto !important; + float: none !important; + } + .btn_wrap { + padding: 10px 5px !important; + height: auto !important; + } +}
@@ -405,7 +430,7 @@ function fn_overlapPartMng(){ - + @@ -426,13 +451,19 @@ function fn_overlapPartMng(){ - + - + diff --git a/WebContent/WEB-INF/view/partMng/partMngList.jsp b/WebContent/WEB-INF/view/partMng/partMngList.jsp index 071c468..bf9a759 100644 --- a/WebContent/WEB-INF/view/partMng/partMngList.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngList.jsp @@ -219,8 +219,8 @@ String connector = person.getUserId(); {headerHozAlign : 'center', hozAlign : 'left', width : '100', title : '규격', field : 'SPEC' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '계정구분', field : 'ACCTFG_NM' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '조달구분', field : 'ODRFG_NM' }, - {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '재고단위', field : 'UNIT_DC' }, - {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '관리단위', field : 'UNITMANG_DC' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '재고단위', field : 'UNIT_DC_NM' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '관리단위', field : 'UNITMANG_DC_NM' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '환산수량', field : 'UNITCHNG_NB' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : 'LOT구분', field : 'LOT_FG_NM' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '사용여부', field : 'USE_YN_NM' }, diff --git a/WebContent/WEB-INF/view/partMng/partMngTempList.jsp b/WebContent/WEB-INF/view/partMng/partMngTempList.jsp index 5f2543a..b3cd320 100644 --- a/WebContent/WEB-INF/view/partMng/partMngTempList.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngTempList.jsp @@ -189,8 +189,8 @@ ui-jqgrid tr.jqgrow td { {headerHozAlign : 'center', hozAlign : 'left', width : '100', title : '규격', field : 'SPEC' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '계정구분', field : 'ACCTFG_NM' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '조달구분', field : 'ODRFG_NM' }, - {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '재고단위', field : 'UNIT_DC' }, - {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '관리단위', field : 'UNITMANG_DC' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '재고단위', field : 'UNIT_DC_NM' }, + {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '관리단위', field : 'UNITMANG_DC_NM' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '환산수량', field : 'UNITCHNG_NB' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : 'LOT구분', field : 'LOT_FG_NM' }, {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '사용여부', field : 'USE_YN_NM' }, diff --git a/src/com/pms/controller/PartMngController.java b/src/com/pms/controller/PartMngController.java index fa47ebd..38557e0 100644 --- a/src/com/pms/controller/PartMngController.java +++ b/src/com/pms/controller/PartMngController.java @@ -401,12 +401,16 @@ public class PartMngController { } + // 단위 코드 셀렉트박스 + code_map.put("unit_dc_cd", commonService.bizMakeOptionList("0001399", CommonUtils.nullToEmpty((String)resultMap.get("UNIT_DC")), "common.getCodeselect")); + code_map.put("unitmang_dc_cd", commonService.bizMakeOptionList("0001399", CommonUtils.nullToEmpty((String)resultMap.get("UNITMANG_DC")), "common.getCodeselect")); + }catch(Exception e){ e.printStackTrace(); } request.setAttribute("code_map", code_map); request.setAttribute("resultMap", resultMap); - + return "/partMng/partMngFormPopUp"; } @@ -456,6 +460,10 @@ public class PartMngController { resultMap.put("OBJID", objId); } + // 단위 코드 셀렉트박스 + code_map.put("unit_dc_cd", commonService.bizMakeOptionList("0001399", CommonUtils.nullToEmpty((String)resultMap.get("UNIT_DC")), "common.getCodeselect")); + code_map.put("unitmang_dc_cd", commonService.bizMakeOptionList("0001399", CommonUtils.nullToEmpty((String)resultMap.get("UNITMANG_DC")), "common.getCodeselect")); + }catch(Exception e){ e.printStackTrace(); } @@ -676,7 +684,12 @@ public class PartMngController { Map acctfgParam = new HashMap(); acctfgParam.put("codeId", Constants.ACCTFG_CODE); code_map.put("acctfg_code", commonService.getJqGridSelectBoxJsonData("common.getCodeList", acctfgParam, "선택")); - + + // 단위(UNIT_DC) 공통코드 조회 - jqGrid selectBox용 JSON + Map unitDcParam = new HashMap(); + unitDcParam.put("codeId", "0001399"); + code_map.put("unit_dc_code", commonService.getJqGridSelectBoxJsonData("common.getCodeList", unitDcParam, "선택")); + /* code_map.put("customer_cd",commonService.bizMakeOptionList("", (String)paramMap.get("customer_cd"),"common.getsupplyselect")); code_map.put("project_name",commonService.bizMakeOptionList("", (String)paramMap.get("project_name"),"common.getProjectNameList")); diff --git a/src/com/pms/mapper/partMng.xml b/src/com/pms/mapper/partMng.xml index c389df4..f73d71e 100644 --- a/src/com/pms/mapper/partMng.xml +++ b/src/com/pms/mapper/partMng.xml @@ -162,7 +162,9 @@ P.ODRFG, CASE WHEN P.ODRFG = '0' THEN '구매' WHEN P.ODRFG = '1' THEN '생산' WHEN P.ODRFG = '8' THEN 'Phantom' ELSE '' END AS ODRFG_NM, P.UNIT_DC, + (SELECT CODE_NAME FROM COMM_CODE WHERE CODE_ID = P.UNIT_DC) AS UNIT_DC_NM, P.UNITMANG_DC, + (SELECT CODE_NAME FROM COMM_CODE WHERE CODE_ID = P.UNITMANG_DC) AS UNITMANG_DC_NM, P.UNITCHNG_NB, P.LOT_FG, CASE WHEN P.LOT_FG = '1' THEN '사용' WHEN P.LOT_FG = '0' THEN '미사용' ELSE '' END AS LOT_FG_NM, @@ -7925,12 +7927,21 @@ SELECT PM.OBJID + + +