diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml index 3543d1c..d365846 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml @@ -9062,15 +9062,15 @@ SELECT - + \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml index 4b3d9d6..aac84a8 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -502,6 +502,7 @@ ,EXCHANGE_RATE ,EST_PRICE ,EST_SUPPLY_PRICE + ,IS_DIRECT_ORDER ,(SELECT COUNT(1) FROM ESTIMATE_TEMPLATE WHERE CONTRACT_OBJID = T.OBJID) AS EST_STATUS ,( SELECT IS_SEND @@ -901,6 +902,12 @@ AND TO_DATE(DUE_DATE,'YYYY-MM-DD') TO_DATE(#{due_end_date}, 'YYYY-MM-DD') + + + + AND COALESCE(IS_DIRECT_ORDER, 'N') != 'Y' + + ORDER BY REGDATE DESC @@ -4865,6 +4872,88 @@ WHERE WHERE OBJID = #{objId} + + + UPDATE CONTRACT_MGMT + SET + ORDER_SUPPLY_PRICE = #{order_supply_price}, + ORDER_VAT = #{order_vat}, + ORDER_TOTAL_AMOUNT = #{order_total_amount} + WHERE OBJID = #{objId} + + + + + INSERT INTO CONTRACT_MGMT + ( + OBJID, + CATEGORY_CD, + CUSTOMER_OBJID, + PRODUCT, + AREA_CD, + CUSTOMER_EQUIP_NAME, + CUSTOMER_PROJECT_NAME, + CUSTOMER_PRODUCTION_NO, + MECHANICAL_TYPE, + PAID_TYPE, + RECEIPT_DATE, + REQ_DEL_DATE, + CONTRACT_RESULT, + PO_NO, + ORDER_DATE, + CONTRACT_CURRENCY, + EXCHANGE_RATE, + REGDATE, + WRITER, + CONTRACT_NO, + IS_DIRECT_ORDER + ) + VALUES + ( + #{objId}, + #{category_cd}, + #{customer_objid}, + #{product}, + #{area_cd}, + #{customer_equip_name}, + #{customer_project_name}, + #{customer_production_no}, + #{mechanical_type}, + #{paid_type}, + #{receipt_date}, + #{req_del_date}, + #{contract_result}, + #{po_no}, + #{order_date}, + #{contract_currency}, + #{exchange_rate}, + NOW(), + #{writer}, + (SELECT TO_CHAR(NOW(),'yy')::VARCHAR ||'C-'||LPAD((SELECT NEXTVAL('contract_mgmt_seq'))::VARCHAR ,4,'0')), + #{is_direct_order} + ) + ON CONFLICT (OBJID) DO + UPDATE + SET + CATEGORY_CD = #{category_cd}, + CUSTOMER_OBJID = #{customer_objid}, + PRODUCT = #{product}, + AREA_CD = #{area_cd}, + CUSTOMER_EQUIP_NAME = #{customer_equip_name}, + CUSTOMER_PROJECT_NAME = #{customer_project_name}, + CUSTOMER_PRODUCTION_NO = #{customer_production_no}, + MECHANICAL_TYPE = #{mechanical_type}, + PAID_TYPE = #{paid_type}, + RECEIPT_DATE = #{receipt_date}, + REQ_DEL_DATE = #{req_del_date}, + CONTRACT_RESULT = #{contract_result}, + PO_NO = #{po_no}, + ORDER_DATE = #{order_date}, + CONTRACT_CURRENCY = #{contract_currency}, + EXCHANGE_RATE = #{exchange_rate}, + IS_DIRECT_ORDER = #{is_direct_order} + + diff --git a/WebContent/WEB-INF/view/admin/clientMng/clientMngHistoryList.jsp b/WebContent/WEB-INF/view/admin/clientMng/clientMngHistoryList.jsp deleted file mode 100644 index 148310a..0000000 --- a/WebContent/WEB-INF/view/admin/clientMng/clientMngHistoryList.jsp +++ /dev/null @@ -1,182 +0,0 @@ - - -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ page import="com.pms.common.utils.*"%> -<%@ page import="java.util.*" %> -<%@include file= "/init.jsp" %> - - - - -<%=Constants.SYSTEM_NAME%> - - - - - - - - - - - - -
- -
-
-

창고관리 이력

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
위치코드위치명위치설명가출고코드가출고거래처명적합여부가용재고여부사용여부BASELOC_CDCO_CDLOC_NMKINSERT_IDINSERT_IPINSERT_DTMODIFY_IDMODIFY_IPMODIFY_DTATTR_NMK
${info.LOCATION_CODE}${info.LOCATION_NAME}${info.LOCATION_DESCRIPTION}${info.OUT_CODE}${info.OUT_CO_NAME}${info.FIT_STATUS}${info.AVAILABLE_STATUS}${info.USE_STATUS}${info.BASE_LOC_CD}${info.CO_CD}${info.LOC_NMK}${info.INSERT_ID}${info.INSERT_IP}${info.INSERT_DT}${info.MODIFY_ID}${info.MODIFY_IP}${info.MODIFY_DT}${info.ATTR_NMK}
조회된 정보가 없습니다.
-
-
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
prev   prev   ${nPage}   ${status.index}   nextnext
-

총 ${totalCount}건

-
-
- -
-
-
- - \ No newline at end of file diff --git a/WebContent/WEB-INF/view/admin/processMng/processMngList.jsp b/WebContent/WEB-INF/view/admin/processMng/processMngList.jsp new file mode 100644 index 0000000..9d6580c --- /dev/null +++ b/WebContent/WEB-INF/view/admin/processMng/processMngList.jsp @@ -0,0 +1,166 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="com.pms.common.utils.*"%> +<%@ page import="java.util.*" %> +<%@include file= "/init.jsp" %> +<% + String searchLocationCode = CommonUtils.checkNull(request.getParameter("searchLocationCode")); + String searchLocationName = CommonUtils.checkNull(request.getParameter("searchLocationName")); +%> + + + + +<%=Constants.SYSTEM_NAME%> + + + + + + +
+ +
+
+ +
+
+
+

+ 작업장 관리 +

+
+ + + +
+
+
+ + + + + + + + + +
+
+ + <%@include file="/WEB-INF/view/common/common_gridArea.jsp" %> + +
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/admin/processMng/processMngListFormPopUp.jsp b/WebContent/WEB-INF/view/admin/processMng/processMngListFormPopUp.jsp new file mode 100644 index 0000000..432957a --- /dev/null +++ b/WebContent/WEB-INF/view/admin/processMng/processMngListFormPopUp.jsp @@ -0,0 +1,182 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="com.pms.common.utils.*"%> +<%@include file="/init.jsp"%> + + + +<%=Constants.SYSTEM_NAME%> + + + +
+
+

작업장 등록/수정

+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
작업장코드
외주거래처코드
작업장명
외주거래처명
작업장설명
적합여부 + +
사용여부 + +
BASELOC_CD
CO_CD
AVABSTOCK_YN
LOC_NMK
INSERT_ID
INSERT_IP
INSERT_DT
MODIFY_ID
MODIFY_IP
MODIFY_DT
ATTR_NMK
+
+
+
+ +
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp b/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp index ad6b247..1a85f5c 100644 --- a/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp +++ b/WebContent/WEB-INF/view/salesMng/salesRequestFormPopUp.jsp @@ -2,7 +2,7 @@ <%@ page import="com.pms.common.utils.*"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ page import="java.util.*" %> -<%@include file= "/init.jsp" %> +<%@include file= "/init_new.jsp" %> <% Map info = (HashMap)(request.getAttribute("resultMap")); boolean isModify = true; @@ -496,139 +496,82 @@ function fn_callbackFnc(){
-

- 구매요청서
(Purchase request) +

+ 구매요청서 (Purchase Request)

- - - - - - - - - - - - - - - - - - <%-- - - - - - - - - - - - --%> -
- - - - - -
- ${resultMap.WRITER_NAME} -
- ${resultMap.REGDATE_TITLE} -
- - - - - - - - - - - - + + + + + + + + + + - - - + - - - + + + + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - -
- <%-- --%> - + + - ${code_map.project_no} - + + + +
- + + - + + + + + + +
- - - - - -
- - - - + - -
- -
@@ -637,9 +580,14 @@ function fn_callbackFnc(){ <% if(isModify){ %>
- + + + <% }else{ %> + + <% } %> +
- <% } %> +
@@ -657,8 +605,8 @@ function fn_callbackFnc(){ - - + + @@ -666,7 +614,7 @@ function fn_callbackFnc(){ 품번 품명 수량 - 공급업체 + @@ -677,8 +625,8 @@ function fn_callbackFnc(){ - - + + @@ -687,20 +635,20 @@ function fn_callbackFnc(){ -
- <%-- --%> -
+ + + - <% if(isModify){ %> - - - <% }else{ %> - - <% } %> - -
- <%-- --%> -
+ + + + + + + + + +
diff --git a/src/com/pms/controller/AdminController.java b/src/com/pms/controller/AdminController.java index e59769a..9aee2a0 100644 --- a/src/com/pms/controller/AdminController.java +++ b/src/com/pms/controller/AdminController.java @@ -1646,6 +1646,8 @@ public String deleteClient(HttpServletRequest request, @RequestParam Map paramMap){ ArrayList parsingClientList = new ArrayList(); @@ -1691,10 +1695,12 @@ public String parsingExcelClient(HttpServletRequest request, @RequestParam Map countExcelclient(HttpServletRequest request, @RequestParam Map paramMap){ @@ -1732,13 +1740,15 @@ public Map countExcelclient(HttpServletRequest request, @Request return resultMap; } +*/ /** - * Excel 파일 업로드 처리(ajax) + * Excel 파일 업로드 처리(ajax) (미사용 - 주석처리) * @param request * @param paramMap * @return */ +/* @RequestMapping("/admin/excelImportFileProc.do") public String excelImportFileProc(HttpServletRequest request, HttpSession session, @RequestParam Map paramMap){ System.out.println("excelImportFileProc().."); @@ -1768,13 +1778,15 @@ public String excelImportFileProc(HttpServletRequest request, HttpSession sessio return "/ajax/ajaxResult"; } +*/ /** - * Client 첨부파일 업로드 처리(ajax) + * Client 첨부파일 업로드 처리(ajax) (미사용 - 주석처리) * @param request * @param paramMap * @return */ +/* @RequestMapping("/admin/clientImportFileProc.do") public String clientImportFileProc(HttpServletRequest request, HttpSession session, @RequestParam Map paramMap){ System.out.println("clientImportFileProc().."); @@ -1804,11 +1816,63 @@ public String clientImportFileProc(HttpServletRequest request, HttpSession sessi return "/ajax/ajaxResult"; } +*/ -// 일반거래처 11월 20일 이희진 +// 일반거래처 11월 20일 이희진 / 11월 24일 이희진 + // /** + // * 공정 관리 데이터를 저장한다. 11월 24일 이희진 + // * TODO: Service 구현 필요 + // * @param request + // * @param paramMap + // * @return + // */ + // @RequestMapping("/admin/saveProcessMngListInfo.do") + // public String saveProcessMngListInfo(HttpServletRequest request, @RequestParam Map paramMap){ + // HashMap resultMap = new HashMap(); + // try{ + // + // ArrayList existList = adminService.getDuplicateProcessMngListInfo(request, paramMap); + // if(null != existList && 0 < existList.size()){ + // resultMap = CommonUtils.setReqAttrResultMsg(request, "중복된 공정명이 존재 합니다.", "false", null,null); + // }else{ + // adminService.saveProcessMngListInfo(request, paramMap); + // resultMap = CommonUtils.setReqAttrResultMsg(request, "저장하였습니다.", "true", null,null); + // } + // }catch(Exception e){ + // e.printStackTrace(); + // resultMap = CommonUtils.setReqAttrResultMsg(request, "오류가 발생하였습니다.", "false", e,null); + // } + // request.setAttribute("RESULT", CommonUtils.getJsonMap(resultMap)); + // + // return "/ajax/ajaxResult"; + // } +// /** +// * 공정 관리 삭제 11월 24일 이희진 +// * TODO: Service 구현 필요 +// * @param request +// * @param paramMap +// * @return +// */ +// @RequestMapping("/admin/deleteProcessMng.do") +// public String deleteProcessMng(HttpServletRequest request, @RequestParam Map paramMap){ +// HashMap resultMap = new HashMap(); +// try{ +// adminService.deleteProcessMng(request, paramMap); +// resultMap.put("result", true); +// resultMap.put("msg", "삭제되었습니다."); +// }catch(Exception e){ +// e.printStackTrace(); +// resultMap.put("result", false); +// resultMap.put("msg", "삭제 중 오류가 발생했습니다."); +// } +// request.setAttribute("RESULT", CommonUtils.getJsonMap(resultMap)); +// return "/ajax/ajaxResult"; +// } + +//----------------------11월 24일 이희진---------------------- diff --git a/src/com/pms/mapper/admin.xml b/src/com/pms/mapper/admin.xml index 3543d1c..d365846 100644 --- a/src/com/pms/mapper/admin.xml +++ b/src/com/pms/mapper/admin.xml @@ -9062,15 +9062,15 @@ SELECT - + \ No newline at end of file diff --git a/src/com/pms/service/AdminService.java b/src/com/pms/service/AdminService.java index 41b841d..f1a504b 100644 --- a/src/com/pms/service/AdminService.java +++ b/src/com/pms/service/AdminService.java @@ -2660,268 +2660,11 @@ public class AdminService extends BaseService { } } -/** - * 업로드된 Excel File을 통해 데이터를 Parsing 한다. - * @param request - * @param paramMap - * @return +/* CLIENT 엑셀 업로드 관련 메서드 주석처리 (2024-11-24) + * - parsingExcelClient + * - saveClientMaster + * - countExcelclient */ -public ArrayList parsingExcelClient(HttpServletRequest request,Map paramMap)throws Exception{ - ArrayList resultList = new ArrayList(); - ArrayList fileList = commonService.getFileList(paramMap); - SqlSession sqlSession = SqlMapConfig.getInstance().getSqlSession(false); - if(null != fileList && 1 == fileList.size()){ - HashMap fileMap = (HashMap)fileList.get(0); - - String path = CommonUtils.checkNull(fileMap.get("FILE_PATH")); - String fileName = CommonUtils.checkNull(fileMap.get("SAVED_FILE_NAME")); - - // OS에 관계없이 올바른 경로 생성 (Linux/Windows 호환) - File excelFile = new File(path, fileName); - FileInputStream fis = new FileInputStream(excelFile); - - // .xls와 .xlsx 둘 다 지원 - org.apache.poi.ss.usermodel.Workbook workBook = null; - if (fileName.endsWith(".xls") || fileName.endsWith(".XLS")) { - workBook = new org.apache.poi.hssf.usermodel.HSSFWorkbook(fis); - } else if (fileName.endsWith(".xlsx") || fileName.endsWith(".XLSX")) { - workBook = new XSSFWorkbook(fis); - } - - FormulaEvaluator formulaEval = workBook.getCreationHelper().createFormulaEvaluator(); - org.apache.poi.ss.usermodel.Sheet sheet = workBook.getSheetAt(0); - // 데이터 포멧터 - DataFormatter formatter = new DataFormatter(); - int rows = sheet.getPhysicalNumberOfRows(); - for(int rowIndex= 1 ; rowIndex < rows ; rowIndex++){ // 2번째 행부터 읽기 (헤더 1행 + 데이터) - org.apache.poi.ss.usermodel.Row row = sheet.getRow(rowIndex); - if(null != row){ - HashMap clientMap = new HashMap(); - HashMap sqlMap = new HashMap(); - for(int columnIndex = 0 ; columnIndex < 110 ; columnIndex++){ // 110개 컬럼 - org.apache.poi.ss.usermodel.Cell cell = row.getCell(columnIndex); - //데이터 유형별 get data - String cellValue = ""; - - if(null != cell){ - if(cell.getCellType() == org.apache.poi.ss.usermodel.Cell.CELL_TYPE_FORMULA){ - cellValue = formatter.formatCellValue(cell, formulaEval); - }else if(cell.getCellType() == org.apache.poi.ss.usermodel.Cell.CELL_TYPE_NUMERIC){ - if(DateUtil.isCellDateFormatted(cell)){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - cellValue = sdf.format(cell.getDateCellValue()); - }else{ - cellValue = formatter.formatCellValue(cell); - } - }else{ - cellValue = formatter.formatCellValue(cell); - } - } - - switch(columnIndex){ - case 0 : clientMap.put("COMP_CODE", cellValue); break; - case 1 : clientMap.put("CLIENT_CD", cellValue); break; - case 2 : clientMap.put("CLIENT_NM", cellValue); break; - case 3 : clientMap.put("TR_NMK", cellValue); break; - case 4 : clientMap.put("CLIENT_NMK", cellValue); break; - case 5 : clientMap.put("ATTR_NMK", cellValue); break; - case 6 : clientMap.put("CLIENT_TYPE", cellValue); break; - case 7 : clientMap.put("BUS_REG_NO", cellValue); break; - case 8 : clientMap.put("RESIDENT_NO", cellValue); break; - case 9 : clientMap.put("CEO_NM", cellValue); break; - case 10 : clientMap.put("CEO_NMK", cellValue); break; - case 11 : clientMap.put("BUS_TYPE", cellValue); break; - case 12 : clientMap.put("BUS_ITEM", cellValue); break; - case 13 : clientMap.put("POST_NO", cellValue); break; - case 14 : clientMap.put("ADDR1", cellValue); break; - case 15 : clientMap.put("ADDR2", cellValue); break; - case 16 : clientMap.put("ADDR_FG", cellValue); break; - case 17 : clientMap.put("TEL_NO", cellValue); break; - case 18 : clientMap.put("FAX_NO", cellValue); break; - case 19 : clientMap.put("HOMEPAGE", cellValue); break; - case 20 : clientMap.put("EMAIL", cellValue); break; - case 21 : clientMap.put("LIQ_RS", cellValue); break; - case 22 : clientMap.put("TR_FG", cellValue); break; - case 23 : clientMap.put("COUNTRY_NM", cellValue); break; - case 24 : clientMap.put("CLASS_CD", cellValue); break; - case 25 : clientMap.put("CLASS_NM", cellValue); break; - case 26 : clientMap.put("GRADE_CD", cellValue); break; - case 27 : clientMap.put("GRADE_NM", cellValue); break; - case 28 : clientMap.put("COLLECT_CLIENT_CD", cellValue); break; - case 29 : clientMap.put("COLLECT_CLIENT_NM", cellValue); break; - case 30 : clientMap.put("REGION_CD", cellValue); break; - case 31 : clientMap.put("REGION_NM", cellValue); break; - case 32 : clientMap.put("TRADE_START_DT", cellValue); break; - case 33 : clientMap.put("TRADE_END_DT", cellValue); break; - case 34 : clientMap.put("USE_YN", cellValue); break; - case 35 : clientMap.put("CONTRACT_START_DT", cellValue); break; - case 36 : clientMap.put("CONTRACT_END_DT", cellValue); break; - case 37 : clientMap.put("TRADE_TYPE", cellValue); break; - case 38 : clientMap.put("DISCOUNT_RATE", cellValue); break; - case 39 : clientMap.put("CONTRACT_AMT", cellValue); break; - case 40 : clientMap.put("MONTHLY_FEE", cellValue); break; - case 41 : clientMap.put("PAYMENT_TERM", cellValue); break; - case 42 : clientMap.put("RCP_TP", cellValue); break; - case 43 : clientMap.put("CREDIT_LIMIT", cellValue); break; - case 44 : clientMap.put("LIMIT_RETURN_DAY", cellValue); break; - case 45 : clientMap.put("PUR_BANK_CD", cellValue); break; - case 46 : clientMap.put("PUR_BANK_NM", cellValue); break; - case 47 : clientMap.put("PUR_BRANCH_NM", cellValue); break; - case 48 : clientMap.put("PUR_ACCOUNT_NO", cellValue); break; - case 49 : clientMap.put("PUR_ACCOUNT_HOLDER", cellValue); break; - case 50 : clientMap.put("PUR_PAY_PLAN", cellValue); break; - case 51 : clientMap.put("PUR_SLIP_TYPE", cellValue); break; - case 52 : clientMap.put("PUR_TAX_TYPE", cellValue); break; - case 53 : clientMap.put("SALE_BANK_CD", cellValue); break; - case 54 : clientMap.put("SALE_BANK_NM", cellValue); break; - case 55 : clientMap.put("SALE_BRANCH_NM", cellValue); break; - case 56 : clientMap.put("SALE_ACCOUNT_NO", cellValue); break; - case 57 : clientMap.put("SALE_COLLECT_PLAN", cellValue); break; - case 58 : clientMap.put("SALE_SLIP_TYPE", cellValue); break; - case 59 : clientMap.put("SALE_TAX_TYPE", cellValue); break; - case 60 : clientMap.put("VENDOR_DEPT_NM", cellValue); break; - case 61 : clientMap.put("VENDOR_POSITION", cellValue); break; - case 62 : clientMap.put("VENDOR_DUTY", cellValue); break; - case 63 : clientMap.put("VENDOR_MANAGER_NM", cellValue); break; - case 64 : clientMap.put("VENDOR_TEL", cellValue); break; - case 65 : clientMap.put("VENDOR_EXT", cellValue); break; - case 66 : clientMap.put("VENDOR_MOBILE", cellValue); break; - case 67 : clientMap.put("VENDOR_EMAIL", cellValue); break; - case 68 : clientMap.put("MGR_DEPT_CD", cellValue); break; - case 69 : clientMap.put("MGR_DEPT_NM", cellValue); break; - case 70 : clientMap.put("MGR_POSITION", cellValue); break; - case 71 : clientMap.put("MGR_DUTY", cellValue); break; - case 72 : clientMap.put("MGR_EMP_CD", cellValue); break; - case 73 : clientMap.put("MGR_EMP_NM", cellValue); break; - case 74 : clientMap.put("MGR_TEL", cellValue); break; - case 75 : clientMap.put("MGR_EXT", cellValue); break; - case 76 : clientMap.put("MGR_MOBILE", cellValue); break; - case 77 : clientMap.put("MGR_EMAIL", cellValue); break; - case 78 : clientMap.put("MGR_REMARK", cellValue); break; - case 79 : clientMap.put("REC_REMARK", cellValue); break; - case 80 : clientMap.put("REC_POST_NO", cellValue); break; - case 81 : clientMap.put("REC_ADDR1", cellValue); break; - case 82 : clientMap.put("REC_ADDR2", cellValue); break; - case 83 : clientMap.put("REC_ADDR_FG", cellValue); break; - case 84 : clientMap.put("REC_TEL", cellValue); break; - case 85 : clientMap.put("REC_FAX", cellValue); break; - case 86 : clientMap.put("PROJECT_CD", cellValue); break; - case 87 : clientMap.put("PROJECT_NM", cellValue); break; - case 88 : clientMap.put("PJT_NMK", cellValue); break; - case 89 : clientMap.put("EXT_DATA_CD", cellValue); break; - case 90 : clientMap.put("E_TAX_YN", cellValue); break; - case 91 : clientMap.put("UNIT_REPORT_CLIENT", cellValue); break; - case 92 : clientMap.put("SUB_BUS_NO", cellValue); break; - case 93 : clientMap.put("PROCUREMENT_YN", cellValue); break; - case 94 : clientMap.put("USER_DEF_DC1", cellValue); break; - case 95 : clientMap.put("USER_DEF_DC2", cellValue); break; - case 96 : clientMap.put("USE_FG", cellValue); break; - case 97 : clientMap.put("USE_NM", cellValue); break; - case 98 : clientMap.put("BIZCON_FG", cellValue); break; - case 99 : clientMap.put("BIZCON_NM", cellValue); break; - case 100 : clientMap.put("SHIP_TP", cellValue); break; - case 101 : clientMap.put("SHIP_NM", cellValue); break; - case 102 : clientMap.put("PLAN_DAY_TYPE", cellValue); break; - case 103 : clientMap.put("PLAN_DAY", cellValue); break; - case 104 : clientMap.put("PURPOSE_TYPE", cellValue); break; - case 105 : clientMap.put("FOR_YN", cellValue); break; - case 106 : clientMap.put("CHECK_DATA", cellValue); break; - case 107 : clientMap.put("CHECK_STATE", cellValue); break; - case 108 : clientMap.put("CHECK_ORDER", cellValue); break; - case 109 : clientMap.put("FIXED_ORDER", cellValue); break; // 110번째 컬럼 - } - } - - sqlMap.put("CLIENT_CD", clientMap.get("CLIENT_CD")); - - Map dupClientMap = sqlSession.selectOne("admin.getDuplicateClientExcel", sqlMap); - - if(null != dupClientMap){ - clientMap.put("DUP_YN", "Y"); - }else{ - clientMap.put("DUP_YN", "N"); - } - - resultList.add(clientMap); - } - } - - fis.close(); - } - sqlSession.close(); - return resultList; -} - -/** - * 거래처 일괄 저장 - * @param request - * @param paramMap - */ -public void saveClientMaster(HttpServletRequest request,Map paramMap){ - SqlSession sqlSession = null; - Map tempMap = new HashMap(); - try{ - String GridData = CommonUtils.checkNull(paramMap.get("jqGrid")); - System.out.println("GridData -------------------------->"+GridData); - System.out.println("CommonUtils.checkNull(paramMap.get(jqGrid)) -------------------------->"+CommonUtils.checkNull(paramMap.get("jqGrid"))); - - List> gridDataList = JsonUtil.JsonToList(GridData); - - sqlSession = SqlMapConfig.getInstance().getSqlSession(false); - byte[] buf = new byte[1024]; - System.out.println("gridDataSIZE : " + gridDataList.size()); - for(int i=0; i