diff --git a/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp b/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp index 4f9fa2c..3d2e2d7 100644 --- a/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/openBomReportExcelImportPopUp.jsp @@ -233,10 +233,12 @@ $(document).ready(function(){ // JSON 파싱 시 에러 처리 var unit_cd_val = $("#unit_cd").val(); var part_type_val = $("#part_type").val(); + var acctfg_code_val = $("#acctfg_code").val(); var sup_code_val = $("#sup_code").val(); var unit_cd = unit_cd_val && unit_cd_val.trim() !== '' ? $.parseJSON(unit_cd_val) : {}; var part_type = part_type_val && part_type_val.trim() !== '' ? $.parseJSON(part_type_val) : {}; + var acctfg_code = acctfg_code_val && acctfg_code_val.trim() !== '' ? $.parseJSON(acctfg_code_val) : {}; var sup_code = sup_code_val && sup_code_val.trim() !== '' ? $.parseJSON(sup_code_val) : {}; //Excel File Upload된 파일 목록 부분을 초기화 한다. @@ -248,7 +250,7 @@ $(document).ready(function(){ grid = $("#expenseDetailGrid").jqGrid({ url: "" ,datatype: "local" - ,colNames: ["상태","모품번","품번","품명","수량","항목수량","재료","열처리경도","열처리방법","표면처리","메이커","범주이름"] + ,colNames: ["상태","모품번","품번","품명","수량","항목수량","재료","열처리경도","열처리방법","표면처리","메이커","범주이름","계정구분","조달구분"] ,colModel: [ {name:"NOTE",index:"NOTE", width: 200, align:"center", hidden: false, sortable:false, editable:true ,editoptions:{ @@ -352,6 +354,28 @@ $(document).ready(function(){ } } } + ,{name:"ACCTFG" ,index:"ACCTFG" , width:80, align:"center", hidden:false, sortable:false, editable: true + ,edittype :"select" + ,formatter :"select" + ,editoptions:{ + value: acctfg_code + ,dataInit : function(e){ + e.style.width = "92%"; + e.style.fontSize = 13; + } + } + } + ,{name:"ODRFG" ,index:"ODRFG" , width:80, align:"center", hidden:false, sortable:false, editable: true + ,edittype :"select" + ,formatter :"select" + ,editoptions:{ + value: {"":"선택","0":"구매","1":"생산"} + ,dataInit : function(e){ + e.style.width = "92%"; + e.style.fontSize = 13; + } + } + } ] //,cellEdit : true //,cellsubmit : "clientArray" @@ -1245,6 +1269,7 @@ function fn_save(){ + diff --git a/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp b/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp index a56c38e..32c6a4f 100644 --- a/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/openPartExcelImportPopUp.jsp @@ -36,6 +36,7 @@ $(document).ready(function(){ //var unit_cd = $.parseJSON($("#unit_cd").val()); //jqGrid 구분 var part_type = $.parseJSON($("#part_type").val()); //jqGrid 구분 + var acctfg_code = $.parseJSON($("#acctfg_code").val()); //jqGrid 계정구분 var sup_code = $.parseJSON($("#sup_code").val()); //jqGrid 구분 //Excel File Upload된 파일 목록 부분을 초기화 한다. @@ -48,7 +49,7 @@ $(document).ready(function(){ url: "" ,datatype: "local" ,colNames: ["결과", - "품번","품명","재료","열처리경도","열처리방법","표면처리","공급업체","범주 이름","비고"] //PART구분(부품 유형) + "품번","품명","재료","열처리경도","열처리방법","표면처리","공급업체","범주 이름","계정구분","조달구분","비고"] //PART구분(부품 유형) ,colModel: [ /* */ {name:"NOTE",index:"NOTE", width: 200, align:"left", hidden: false, sortable:false, editable:true @@ -156,6 +157,28 @@ $(document).ready(function(){ } } } + ,{name:"ACCTFG" ,index:"ACCTFG" , width:80, align:"center", hidden:false, sortable:false, editable: true + ,edittype :"select" + ,formatter :"select" + ,editoptions:{ + value: acctfg_code + ,dataInit : function(e){ + e.style.width = "92%"; + e.style.fontSize = 13; + } + } + } + ,{name:"ODRFG" ,index:"ODRFG" , width:80, align:"center", hidden:false, sortable:false, editable: true + ,edittype :"select" + ,formatter :"select" + ,editoptions:{ + value: {"":"선택","0":"구매","1":"생산"} + ,dataInit : function(e){ + e.style.width = "92%"; + e.style.fontSize = 13; + } + } + } ,{name:"REMARK",index:"REMARK", width: 130, align:"center", hidden: false, sortable:false, editable:true ,editoptions:{ dataInit : function(e){ @@ -961,6 +984,7 @@ function fn_save(){ + diff --git a/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp b/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp index 806f48b..62dde9a 100644 --- a/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngDetailPopUp.jsp @@ -65,6 +65,7 @@ $(document).ready(function(){ fnc_getCodeListAppend("<%=Constants.UNIT_CODE%>","UNIT","${resultMap.UNIT}"); fnc_getCodeListAppend("<%=Constants.PART_TYPE_CODE%>","PART_TYPE","${resultMap.PART_TYPE}"); + fnc_getCodeListAppend("<%=Constants.ACCTFG_CODE%>","ACCTFG","${resultMap.ACCTFG}"); fnc_getCodeListAppend("<%=Constants.MATERIAL_CODE%>","MATERIAL","${resultMap.MATERIAL}"); fnc_getCodeListAppend("<%=Constants.SPEC_NO_CODE%>","SPEC_NO","${resultMap.SPEC_NO}"); fnc_getCodeListAppend("<%=Constants.DESIGN_APPLY_POINT_CODE%>","DESIGN_APPLY_POINT","${resultMap.DESIGN_APPLY_POINT}"); @@ -317,6 +318,8 @@ function fn_enableEdit(){ $('#SURFACE_TREATMENT').prop('readonly', false).prop('disabled', false); $('#MAKER').prop('readonly', false).prop('disabled', false); $('#PART_TYPE').prop('disabled', false); + $('#ACCTFG').prop('disabled', false); + $('#ODRFG').prop('disabled', false); $('#REMARK').prop('readonly', false).prop('disabled', false); // 버튼 표시 변경 @@ -349,6 +352,8 @@ function fn_save(){ SURFACE_TREATMENT: $('#SURFACE_TREATMENT').val(), MAKER: $('#MAKER').val(), PART_TYPE: $('#PART_TYPE').val(), + ACCTFG: $('#ACCTFG').val(), + ODRFG: $('#ODRFG').val(), REMARK: $('#REMARK').val() }; @@ -552,6 +557,24 @@ section { + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp b/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp index 1afb9a7..d063eaf 100644 --- a/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp +++ b/WebContent/WEB-INF/view/partMng/partMngFormPopUp.jsp @@ -47,6 +47,7 @@ $(document).ready(function(){ fnc_getCodeListAppend("<%=Constants.UNIT_CODE%>","UNIT","${resultMap.UNIT}"); fnc_getCodeListAppend("<%=Constants.PART_TYPE_CODE%>","PART_TYPE","${resultMap.PART_TYPE}"); + fnc_getCodeListAppend("<%=Constants.ACCTFG_CODE%>","ACCTFG","${resultMap.ACCTFG}"); fnc_getCodeListAppend("<%=Constants.MATERIAL_CODE%>","MATERIAL","${resultMap.MATERIAL}"); fnc_getCodeListAppend("<%=Constants.SPEC_NO_CODE%>","SPEC_NO","${resultMap.SPEC_NO}"); fnc_getCodeListAppend("<%=Constants.DESIGN_APPLY_POINT_CODE%>","DESIGN_APPLY_POINT","${resultMap.DESIGN_APPLY_POINT}"); @@ -374,6 +375,25 @@ function fn_overlapPartMng(){ + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/view/productionplanning/prodPlanResultMgmtList.jsp b/WebContent/WEB-INF/view/productionplanning/prodPlanResultMgmtList.jsp index 0b3185b..04bdfff 100644 --- a/WebContent/WEB-INF/view/productionplanning/prodPlanResultMgmtList.jsp +++ b/WebContent/WEB-INF/view/productionplanning/prodPlanResultMgmtList.jsp @@ -277,7 +277,7 @@ var columns = [ headerHozAlign: 'center', hozAlign: 'right', width: 90, - title: '출하대기', + title: '포장', field: 'SHIP_WAIT_QTY', cssClass: 'col-light-green', formatter: fnc_createGridAnchorTag, diff --git a/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp b/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp index d4eb9b3..1a65cf1 100644 --- a/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp +++ b/WebContent/WEB-INF/view/productionplanning/prodResultFormPopup.jsp @@ -390,7 +390,7 @@ window.addEventListener('unload', function() { 날짜 완조립 검사 - 출하대기 + 포장 삭제 diff --git a/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx b/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx index e6822b5..b2c2454 100644 Binary files a/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx and b/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx differ diff --git a/src/com/pms/common/utils/Constants.java b/src/com/pms/common/utils/Constants.java index d95be36..4627607 100644 --- a/src/com/pms/common/utils/Constants.java +++ b/src/com/pms/common/utils/Constants.java @@ -423,6 +423,7 @@ public class Constants { public static final String UNIT_CODE = "0000059"; //UNIT public static final String UPG_COMMON_CODE = "0000042"; //UPG public static final String PART_TYPE_CODE = "0000062"; //PART_TYPE + public static final String ACCTFG_CODE = "0900213"; //계정구분 public static final String PART_CHANGE_TYPE_CODE = "0001054"; //CHANGE_TYPE_ public static final String PART_CHANGE_OPTION_CODE = "0000318"; //CHANGE_OPTION diff --git a/src/com/pms/controller/PartMngController.java b/src/com/pms/controller/PartMngController.java index 3e460a1..f03c754 100644 --- a/src/com/pms/controller/PartMngController.java +++ b/src/com/pms/controller/PartMngController.java @@ -667,6 +667,16 @@ public class PartMngController { try{ objid = CommonUtils.createObjId(); + // 범주이름(PART_TYPE) 공통코드 조회 - jqGrid selectBox용 JSON + Map partTypeParam = new HashMap(); + partTypeParam.put("codeId", Constants.PART_TYPE_CODE); + code_map.put("part_type", commonService.getJqGridSelectBoxJsonData("common.getCodeList", partTypeParam, "선택")); + + // 계정구분(ACCTFG) 공통코드 조회 - jqGrid selectBox용 JSON + Map acctfgParam = new HashMap(); + acctfgParam.put("codeId", Constants.ACCTFG_CODE); + code_map.put("acctfg_code", commonService.getJqGridSelectBoxJsonData("common.getCodeList", acctfgParam, "선택")); + /* 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")); @@ -1856,6 +1866,11 @@ public class PartMngController { //제품구분 code_map.put("product_cd", commonService.bizMakeOptionList("0000001", CommonUtils.nullToEmpty((String)paramMap.get("product_cd")),"common.getCodeselect")); //제품구분 + + // 계정구분(ACCTFG) 공통코드 조회 - jqGrid selectBox용 JSON + Map acctfgParam = new HashMap(); + acctfgParam.put("codeId", Constants.ACCTFG_CODE); + code_map.put("acctfg_code", commonService.getJqGridSelectBoxJsonData("common.getCodeList", acctfgParam, "선택")); sqlSession = SqlMapConfig.getInstance().getSqlSession(); diff --git a/src/com/pms/mapper/partMng.xml b/src/com/pms/mapper/partMng.xml index e5fa5e8..7d504a6 100644 --- a/src/com/pms/mapper/partMng.xml +++ b/src/com/pms/mapper/partMng.xml @@ -157,6 +157,8 @@ P.HEAT_TREATMENT_HARDNESS, P.HEAT_TREATMENT_METHOD, P.SURFACE_TREATMENT, + P.ACCTFG, + P.ODRFG, COALESCE(FILE_CNT.CU01_CNT, 0) CU01_CNT, COALESCE(FILE_CNT.CU02_CNT, 0) CU02_CNT, COALESCE(FILE_CNT.CU03_CNT, 0) CU03_CNT, @@ -655,7 +657,9 @@ SUB_CATEGORY, HEAT_TREATMENT_HARDNESS, HEAT_TREATMENT_METHOD, - SURFACE_TREATMENT + SURFACE_TREATMENT, + ACCTFG, + ODRFG ) VALUES ( #{OBJID}::NUMERIC, #{PRODUCT_MGMT_OBJID}, @@ -701,7 +705,9 @@ #{SUB_CATEGORY}, #{HEAT_TREATMENT_HARDNESS}, #{HEAT_TREATMENT_METHOD}, - #{SURFACE_TREATMENT} + #{SURFACE_TREATMENT}, + #{ACCTFG}, + #{ODRFG} ) ON CONFLICT (OBJID) DO UPDATE @@ -745,7 +751,9 @@ SUB_CATEGORY = #{SUB_CATEGORY}, HEAT_TREATMENT_HARDNESS = #{HEAT_TREATMENT_HARDNESS}, HEAT_TREATMENT_METHOD = #{HEAT_TREATMENT_METHOD}, - SURFACE_TREATMENT = #{SURFACE_TREATMENT} + SURFACE_TREATMENT = #{SURFACE_TREATMENT}, + ACCTFG = #{ACCTFG}, + ODRFG = #{ODRFG} @@ -802,7 +810,9 @@ HEAT_TREATMENT_HARDNESS, HEAT_TREATMENT_METHOD, SURFACE_TREATMENT, - SUPPLY_CODE + SUPPLY_CODE, + ACCTFG, + ODRFG ) VALUES ( #{OBJID}::NUMERIC, #{PRODUCT_MGMT_OBJID}, @@ -860,7 +870,9 @@ #{HEAT_TREATMENT_HARDNESS}, #{HEAT_TREATMENT_METHOD}, #{SURFACE_TREATMENT}, - #{SUPPLY_CODE} + #{SUPPLY_CODE}, + #{ACCTFG}, + #{ODRFG} ) ON CONFLICT (OBJID) DO UPDATE @@ -911,7 +923,9 @@ HEAT_TREATMENT_HARDNESS = #{HEAT_TREATMENT_HARDNESS}, HEAT_TREATMENT_METHOD = #{HEAT_TREATMENT_METHOD}, SURFACE_TREATMENT = #{SURFACE_TREATMENT}, - SUPPLY_CODE = #{SUPPLY_CODE} + SUPPLY_CODE = #{SUPPLY_CODE}, + ACCTFG = #{ACCTFG}, + ODRFG = #{ODRFG} INSERT INTO PART_MNG_HISTORY @@ -2653,6 +2667,8 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* SURFACE_TREATMENT = #{SURFACE_TREATMENT}, MAKER = #{MAKER}, PART_TYPE = #{PART_TYPE}, + ACCTFG = #{ACCTFG}, + ODRFG = #{ODRFG}, REMARK = #{REMARK}, EDIT_DATE = NOW() WHERE OBJID = #{OBJID} @@ -6680,6 +6696,16 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* AND status='create' + + @@ -7448,6 +7474,8 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* ,HEAT_TREATMENT_HARDNESS ,HEAT_TREATMENT_METHOD ,SURFACE_TREATMENT + ,ACCTFG + ,ODRFG ) VALUES ( #{PART_OBJID}::NUMERIC ,#{PART_NO} @@ -7476,6 +7504,8 @@ SELECT T1.LEV, T1.BOM_REPORT_OBJID, T1.ROOT_PART_NO, T1.PATH, T1.LEAF, T2.* ,#{HEAT_TREATMENT_HARDNESS} ,#{HEAT_TREATMENT_METHOD} ,#{SURFACE_TREATMENT} + ,#{ACCTFG} + ,#{ODRFG} ) @@ -7699,6 +7729,15 @@ SELECT PM.OBJID AND PARENT_CODE_ID='0000062' + + +