diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml index eb291e3..e7aa21d 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml @@ -8770,6 +8770,277 @@ SELECT + + + + + + + + + + + + + + INSERT INTO CLIENT_MNG ( + OBJID, COMP_CODE, CLIENT_CD, CLIENT_NM, CLIENT_NMK, CLIENT_TYPE, + BUS_REG_NO, RESIDENT_NO, CEO_NM, BUS_TYPE, BUS_ITEM, + POST_NO, ADDR1, ADDR2, TEL_NO, FAX_NO, HOMEPAGE, EMAIL, + COUNTRY_NM, CLASS_CD, CLASS_NM, GRADE_CD, GRADE_NM, + COLLECT_CLIENT_CD, COLLECT_CLIENT_NM, REGION_CD, REGION_NM, + TRADE_START_DT, TRADE_END_DT, USE_YN, + CONTRACT_START_DT, CONTRACT_END_DT, TRADE_TYPE, + DISCOUNT_RATE, CONTRACT_AMT, MONTHLY_FEE, PAYMENT_TERM, + CREDIT_LIMIT, LIMIT_RETURN_DAY, + PUR_BANK_CD, PUR_BANK_NM, PUR_BRANCH_NM, PUR_ACCOUNT_NO, + PUR_ACCOUNT_HOLDER, PUR_PAY_PLAN, PUR_SLIP_TYPE, PUR_TAX_TYPE, + SALE_BANK_CD, SALE_BANK_NM, SALE_BRANCH_NM, SALE_ACCOUNT_NO, + SALE_COLLECT_PLAN, SALE_SLIP_TYPE, SALE_TAX_TYPE, + VENDOR_DEPT_NM, VENDOR_POSITION, VENDOR_DUTY, VENDOR_MANAGER_NM, + VENDOR_TEL, VENDOR_EXT, VENDOR_MOBILE, VENDOR_EMAIL, + MGR_DEPT_CD, MGR_DEPT_NM, MGR_POSITION, MGR_DUTY, + MGR_EMP_CD, MGR_EMP_NM, MGR_TEL, MGR_EXT, MGR_MOBILE, MGR_EMAIL, MGR_REMARK, + REC_REMARK, REC_POST_NO, REC_ADDR1, REC_ADDR2, REC_TEL, REC_FAX, + PROJECT_CD, PROJECT_NM, EXT_DATA_CD, E_TAX_YN, + UNIT_REPORT_CLIENT, SUB_BUS_NO, PROCUREMENT_YN, + PLAN_DAY_TYPE, PLAN_DAY, PURPOSE_TYPE, FOR_YN, + USER_DEF_DC1, USER_DEF_DC2, USE_FG, USE_NM, + BIZCON_FG, BIZCON_NM, SHIP_TP, SHIP_NM, + CHECK_DATA, CHECK_STATE, CHECK_ORDER, FIXED_ORDER, + INSERT_ID, INSERT_IP, INSERT_DT, MODIFY_ID, MODIFY_IP, MODIFY_DT + ) VALUES ( + #{objid}::numeric, + #{comp_code}, #{client_cd}, #{client_nm}, #{client_nmk}, #{client_type}, + #{bus_reg_no}, #{resident_no}, #{ceo_nm}, #{bus_type}, #{bus_item}, + #{post_no}, #{addr1}, #{addr2}, #{tel_no}, #{fax_no}, #{homepage}, #{email}, + #{country_nm}, #{class_cd}, #{class_nm}, #{grade_cd}, #{grade_nm}, + #{collect_client_cd}, #{collect_client_nm}, #{region_cd}, #{region_nm}, + #{trade_start_dt}, #{trade_end_dt}, COALESCE(#{use_yn}, 'Y'), + #{contract_start_dt}, #{contract_end_dt}, #{trade_type}, + #{discount_rate}, #{contract_amt}, #{monthly_fee}, #{payment_term}, + #{credit_limit}, #{limit_return_day}, + #{pur_bank_cd}, #{pur_bank_nm}, #{pur_branch_nm}, #{pur_account_no}, + #{pur_account_holder}, #{pur_pay_plan}, #{pur_slip_type}, #{pur_tax_type}, + #{sale_bank_cd}, #{sale_bank_nm}, #{sale_branch_nm}, #{sale_account_no}, + #{sale_collect_plan}, #{sale_slip_type}, #{sale_tax_type}, + #{vendor_dept_nm}, #{vendor_position}, #{vendor_duty}, #{vendor_manager_nm}, + #{vendor_tel}, #{vendor_ext}, #{vendor_mobile}, #{vendor_email}, + #{mgr_dept_cd}, #{mgr_dept_nm}, #{mgr_position}, #{mgr_duty}, + #{mgr_emp_cd}, #{mgr_emp_nm}, #{mgr_tel}, #{mgr_ext}, #{mgr_mobile}, #{mgr_email}, #{mgr_remark}, + #{rec_remark}, #{rec_post_no}, #{rec_addr1}, #{rec_addr2}, #{rec_tel}, #{rec_fax}, + #{project_cd}, #{project_nm}, #{ext_data_cd}, #{e_tax_yn}, + #{unit_report_client}, #{sub_bus_no}, #{procurement_yn}, + #{plan_day_type}, #{plan_day}, #{purpose_type}, #{for_yn}, + #{user_def_dc1}, #{user_def_dc2}, #{use_fg}, #{use_nm}, + #{bizcon_fg}, #{bizcon_nm}, #{ship_tp}, #{ship_nm}, + #{check_data}, #{check_state}, #{check_order}, #{fixed_order}, + #{insert_id}, #{insert_ip}, + CASE WHEN #{insert_dt} = '' THEN NOW() ELSE COALESCE(#{insert_dt}::timestamp, NOW()) END, + #{modify_id}, #{modify_ip}, + CASE WHEN #{modify_dt} = '' THEN NULL ELSE #{modify_dt}::timestamp END + ) + ON CONFLICT (OBJID) DO UPDATE SET + COMP_CODE = #{comp_code}, + CLIENT_CD = #{client_cd}, + CLIENT_NM = #{client_nm}, + CLIENT_NMK = #{client_nmk}, + CLIENT_TYPE = #{client_type}, + BUS_REG_NO = #{bus_reg_no}, + RESIDENT_NO = #{resident_no}, + CEO_NM = #{ceo_nm}, + BUS_TYPE = #{bus_type}, + BUS_ITEM = #{bus_item}, + POST_NO = #{post_no}, + ADDR1 = #{addr1}, + ADDR2 = #{addr2}, + TEL_NO = #{tel_no}, + FAX_NO = #{fax_no}, + HOMEPAGE = #{homepage}, + EMAIL = #{email}, + COUNTRY_NM = #{country_nm}, + CLASS_CD = #{class_cd}, + CLASS_NM = #{class_nm}, + GRADE_CD = #{grade_cd}, + GRADE_NM = #{grade_nm}, + COLLECT_CLIENT_CD = #{collect_client_cd}, + COLLECT_CLIENT_NM = #{collect_client_nm}, + REGION_CD = #{region_cd}, + REGION_NM = #{region_nm}, + TRADE_START_DT = #{trade_start_dt}, + TRADE_END_DT = #{trade_end_dt}, + USE_YN = #{use_yn}, + CONTRACT_START_DT = #{contract_start_dt}, + CONTRACT_END_DT = #{contract_end_dt}, + TRADE_TYPE = #{trade_type}, + DISCOUNT_RATE = #{discount_rate}, + CONTRACT_AMT = #{contract_amt}, + MONTHLY_FEE = #{monthly_fee}, + PAYMENT_TERM = #{payment_term}, + CREDIT_LIMIT = #{credit_limit}, + LIMIT_RETURN_DAY = #{limit_return_day}, + PUR_BANK_CD = #{pur_bank_cd}, + PUR_BANK_NM = #{pur_bank_nm}, + PUR_BRANCH_NM = #{pur_branch_nm}, + PUR_ACCOUNT_NO = #{pur_account_no}, + PUR_ACCOUNT_HOLDER = #{pur_account_holder}, + PUR_PAY_PLAN = #{pur_pay_plan}, + PUR_SLIP_TYPE = #{pur_slip_type}, + PUR_TAX_TYPE = #{pur_tax_type}, + SALE_BANK_CD = #{sale_bank_cd}, + SALE_BANK_NM = #{sale_bank_nm}, + SALE_BRANCH_NM = #{sale_branch_nm}, + SALE_ACCOUNT_NO = #{sale_account_no}, + SALE_COLLECT_PLAN = #{sale_collect_plan}, + SALE_SLIP_TYPE = #{sale_slip_type}, + SALE_TAX_TYPE = #{sale_tax_type}, + VENDOR_DEPT_NM = #{vendor_dept_nm}, + VENDOR_POSITION = #{vendor_position}, + VENDOR_DUTY = #{vendor_duty}, + VENDOR_MANAGER_NM = #{vendor_manager_nm}, + VENDOR_TEL = #{vendor_tel}, + VENDOR_EXT = #{vendor_ext}, + VENDOR_MOBILE = #{vendor_mobile}, + VENDOR_EMAIL = #{vendor_email}, + MGR_DEPT_CD = #{mgr_dept_cd}, + MGR_DEPT_NM = #{mgr_dept_nm}, + MGR_POSITION = #{mgr_position}, + MGR_DUTY = #{mgr_duty}, + MGR_EMP_CD = #{mgr_emp_cd}, + MGR_EMP_NM = #{mgr_emp_nm}, + MGR_TEL = #{mgr_tel}, + MGR_EXT = #{mgr_ext}, + MGR_MOBILE = #{mgr_mobile}, + MGR_EMAIL = #{mgr_email}, + MGR_REMARK = #{mgr_remark}, + REC_REMARK = #{rec_remark}, + REC_POST_NO = #{rec_post_no}, + REC_ADDR1 = #{rec_addr1}, + REC_ADDR2 = #{rec_addr2}, + REC_TEL = #{rec_tel}, + REC_FAX = #{rec_fax}, + PROJECT_CD = #{project_cd}, + PROJECT_NM = #{project_nm}, + EXT_DATA_CD = #{ext_data_cd}, + E_TAX_YN = #{e_tax_yn}, + UNIT_REPORT_CLIENT = #{unit_report_client}, + SUB_BUS_NO = #{sub_bus_no}, + PROCUREMENT_YN = #{procurement_yn}, + PLAN_DAY_TYPE = #{plan_day_type}, + PLAN_DAY = #{plan_day}, + PURPOSE_TYPE = #{purpose_type}, + FOR_YN = #{for_yn}, + USER_DEF_DC1 = #{user_def_dc1}, + USER_DEF_DC2 = #{user_def_dc2}, + USE_FG = #{use_fg}, + USE_NM = #{use_nm}, + BIZCON_FG = #{bizcon_fg}, + BIZCON_NM = #{bizcon_nm}, + SHIP_TP = #{ship_tp}, + SHIP_NM = #{ship_nm}, + CHECK_DATA = #{check_data}, + CHECK_STATE = #{check_state}, + CHECK_ORDER = #{check_order}, + FIXED_ORDER = #{fixed_order}, + MODIFY_ID = #{modify_id}, + MODIFY_IP = #{modify_ip}, + MODIFY_DT = NOW() + + + + + DELETE FROM CLIENT_MNG + WHERE OBJID = #{OBJID}::numeric + \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/project.xml b/WebContent/WEB-INF/classes/com/pms/mapper/project.xml index 78f3f2f..5e3d0a9 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/project.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/project.xml @@ -7464,39 +7464,57 @@ SELECT ,( - SELECT - -- 주문유형 코드 (CATEGORY_CD를 영문 약어로 매핑) - CASE CODE_NAME(CATEGORY_CD) - WHEN '오버홀' THEN 'O' - WHEN '개조' THEN 'M' - WHEN '개발' THEN 'D' - WHEN '견적' THEN 'Q' - WHEN '수리' THEN 'R' - WHEN '판매' THEN 'S' - ELSE 'T' - END || '-' || - -- 제품구분 코드 (PRODUCT의 CODE_NAME에서 슬래시 제거) - REPLACE(CODE_NAME(PRODUCT), '/', '') || '-' || + SELECT + -- 주문유형 코드 (CATEGORY_CD를 영문 약어로 매핑) + CASE CODE_NAME(CATEGORY_CD) + WHEN '오버홀' THEN 'O' + WHEN '개조' THEN 'M' + WHEN '개발' THEN 'D' + WHEN '견적' THEN 'Q' + WHEN '수리' THEN 'R' + WHEN '판매' THEN 'S' + ELSE 'T' + END || '-' || + -- 제품구분 코드 (PRODUCT를 약어로 매핑) + CASE CODE_NAME(PRODUCT) + WHEN 'Machine' THEN 'MC' + WHEN 'A/S' THEN 'AS' + WHEN 'D/S' THEN 'DS' + WHEN 'B/S' THEN 'BS' + WHEN 'C/T' THEN 'CT' + WHEN 'A/C' THEN 'AC' + WHEN 'W/M' THEN 'WM' + ELSE REPLACE(CODE_NAME(PRODUCT), '/', '') + END || '-' || -- 날짜 (YYMMDD) TO_CHAR(CURRENT_DATE, 'YYMMDD') || '-' || -- 순번 (001, 002, ...) LPAD( COALESCE( ( - SELECT MAX(SUBSTRING(PROJECT_NO FROM '\d{3}$')::INTEGER) + 1 - FROM PROJECT_MGMT - WHERE PROJECT_NO LIKE - CASE CODE_NAME(CATEGORY_CD) - WHEN '오버홀' THEN 'O' - WHEN '개조' THEN 'M' - WHEN '개발' THEN 'D' - WHEN '견적' THEN 'Q' - WHEN '수리' THEN 'R' - WHEN '판매' THEN 'S' - ELSE 'T' - END || '-' || - REPLACE(CODE_NAME(PRODUCT), '/', '') || '-' || - TO_CHAR(CURRENT_DATE, 'YYMMDD') || '-%' + SELECT MAX(SUBSTRING(PROJECT_NO FROM '\d{3}$')::INTEGER) + 1 + FROM PROJECT_MGMT + WHERE PROJECT_NO LIKE + CASE CODE_NAME(CATEGORY_CD) + WHEN '오버홀' THEN 'O' + WHEN '개조' THEN 'M' + WHEN '개발' THEN 'D' + WHEN '견적' THEN 'Q' + WHEN '수리' THEN 'R' + WHEN '판매' THEN 'S' + ELSE 'T' + END || '-' || + CASE CODE_NAME(PRODUCT) + WHEN 'Machine' THEN 'MC' + WHEN 'A/S' THEN 'AS' + WHEN 'D/S' THEN 'DS' + WHEN 'B/S' THEN 'BS' + WHEN 'C/T' THEN 'CT' + WHEN 'A/C' THEN 'AC' + WHEN 'W/M' THEN 'WM' + ELSE REPLACE(CODE_NAME(PRODUCT), '/', '') + END || '-' || + TO_CHAR(CURRENT_DATE, 'YYMMDD') || '-%' ), 1 )::TEXT, @@ -7530,14 +7548,14 @@ SELECT ,EST_USER_ID ,EST_COMP_DATE ,EST_RESULT_CD - ,AREA_CD - ,MECHANICAL_TYPE - ,#{overhaul_order} - ,#{is_temp} - ,#{part_objid} - ,#{part_no} - ,#{part_name} - ,#{quantity} + ,AREA_CD + ,MECHANICAL_TYPE + ,#{overhaul_order} + ,#{is_temp} + ,#{part_objid} + ,#{part_no} + ,#{part_name} + ,#{quantity} FROM CONTRACT_MGMT WHERE OBJID=#{objId} ) 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 b453411..f3b8400 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -535,7 +535,7 @@ -- 수주수량 (CONTRACT_MGMT의 QUANTITY 또는 CONTRACT_ITEM 합계) ,COALESCE( NULLIF(T.QUANTITY, '')::NUMERIC, - (SELECT COALESCE(SUM(CAST(QUANTITY AS NUMERIC)), 0) FROM CONTRACT_ITEM WHERE CONTRACT_OBJID = T.OBJID AND STATUS = 'ACTIVE') + (SELECT COALESCE(SUM(CAST(ORDER_QUANTITY AS NUMERIC)), 0) FROM CONTRACT_ITEM WHERE CONTRACT_OBJID = T.OBJID AND STATUS = 'ACTIVE') ) AS ORDER_QUANTITY ,CASE WHEN T.ORDER_TOTAL_AMOUNT IS NOT NULL AND T.ORDER_TOTAL_AMOUNT != '' @@ -4758,6 +4758,16 @@ WHERE WHERE OBJID = #{objId} + + + + +
+ + + + + + +
+
+

거래처관리_Excel upload

+
+
+ + +
+ 회사코드 + + +
+
+ +
+
+
   Excel uploadTemplate Download
+
+
+
Drag & Drop 엑셀 템플릿
+
+ + + + + + +
Excel 첨부파일
+
+
+
+
+
+ +
+
+ +
+ + + +
+
+ 신규 0 + 중복 0 +
+
+

+ +
+
+
+
+ +
+
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/admin/clientMng/clientMngList.jsp b/WebContent/WEB-INF/view/admin/clientMng/clientMngList.jsp index bbf1538..18fb9b3 100644 --- a/WebContent/WEB-INF/view/admin/clientMng/clientMngList.jsp +++ b/WebContent/WEB-INF/view/admin/clientMng/clientMngList.jsp @@ -34,8 +34,17 @@ fn_delete(); }); - //fn_search(); // 임시 주석 - DB 테이블 생성 후 활성화 + fn_search(); }); + + function saveexcelpop() { + var url = "/admin/clientExcelImportPopUp.do"; + var target = "clientExcelImportPopUp"; + + window + .open(url, target, + "width=1200, height=700, menubars=no, scrollbars=yes, resizable=yes"); + }