diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml index acf5040..b72f70f 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/admin.xml @@ -9383,7 +9383,7 @@ SELECT - SELECT OBJID, MATERIAL_CODE, @@ -9394,21 +9394,8 @@ SELECT ORDER BY MATERIAL_CODE - - - SELECT OBJID, MATERIAL_CODE, @@ -9420,21 +9407,8 @@ ORDER BY PART_NAME ORDER BY SIZE_SPEC - - - SELECT OBJID, MATERIAL_CODE, @@ -9448,22 +9422,6 @@ ORDER BY PART_NAME LIMIT 1 - - - SELECT * - FROM ( - SELECT A.*, ROW_NUMBER() OVER (ORDER BY ACCT_CD ASC) RNUM - FROM ( - SELECT CO_CD - , ACCT_CD - , ACCT_NM - , DRCR_FG - , CASE WHEN DRCR_FG = '1' THEN '차변' WHEN DRCR_FG = '2' THEN '대변' ELSE DRCR_FG END AS DRCR_FG_NM - , SUB_DISP - , SUB_DISP_NM - , CH_FG - , CH_FG_NM - , ACCT_NMK - , GROUP_CD - , GROUP_NM - , BUD_FG - , BUD_FG_NM - , ATTR_FG - , ATTR_FG_NM - , CTRL_CDS - , RACCT_CD - , RACCT_NM - FROM ERP_ACCT_CODE - WHERE 1=1 - - AND UPPER(ACCT_CD) LIKE UPPER('%${search_acctCd}%') - - - AND UPPER(ACCT_NM) LIKE UPPER('%${search_acctNm}%') - - - AND CH_FG = #{search_chFg} - - ) A - WHERE 1=1 - ) A - WHERE 1=1 - AND - AND = #{PAGE_START}::integer]]> - - - - - \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/approval.xml b/WebContent/WEB-INF/classes/com/pms/mapper/approval.xml index 29bc617..55bafb9 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/approval.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/approval.xml @@ -603,156 +603,7 @@ SELECT CONTRACT_OBJID FROM ESTIMATE_TEMPLATE - WHERE OBJID::VARCHAR = #{estObjId} + WHERE OBJID = #{estObjId}::NUMERIC - - - - - - - - INSERT INTO AMARANTH_APPROVAL ( - APPRO_KEY, TARGET_TYPE, TARGET_OBJID, APPROVAL_TITLE, WRITER, STATUS, REGDATE - ) VALUES ( - #{approKey}, #{targetType}, #{targetObjId}, #{approvalTitle}, #{writer}, 'create', NOW() - ) - - - - - UPDATE AMARANTH_APPROVAL SET - APPROVAL_TITLE = #{approvalTitle}, - WRITER = #{writer}, - UPDATE_DATE = NOW() - WHERE TARGET_OBJID = #{targetObjId} AND TARGET_TYPE = #{targetType} - - - - - - - - UPDATE AMARANTH_APPROVAL SET - AMARANTH_DOC_ID = #{amaranthDocId}, - DOC_STS = #{docSts}, - STATUS = #{status}, - UPDATE_DATE = NOW() - WHERE APPRO_KEY = #{approKey} - - - - - INSERT INTO AMARANTH_APPROVAL ( - APPRO_KEY, TARGET_TYPE, TARGET_OBJID, APPROVAL_TITLE, WRITER, STATUS, REGDATE - ) VALUES ( - #{approKey}, #{targetType}, #{targetObjId}, '결재불필요', #{writer}, 'notRequired', NOW() - ) - - - - - UPDATE AMARANTH_APPROVAL SET - STATUS = 'notRequired', - UPDATE_DATE = NOW() - WHERE TARGET_OBJID = #{targetObjId} AND TARGET_TYPE = #{targetType} - - - - - UPDATE SALES_REQUEST_MASTER SET - STATUS = #{status} - WHERE OBJID::VARCHAR = #{targetObjId}::VARCHAR - - - - - UPDATE ECR_MNG SET - STATUS_CD = #{statusCd} - WHERE OBJID::VARCHAR = #{targetObjId}::VARCHAR - - - - - - - - \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml index f0edca5..a98532c 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/productionplanning.xml @@ -3137,22 +3137,12 @@ PM.CONTRACT_OBJID, PM.PROJECT_NO, PM.BOM_REPORT_OBJID, - PM.PART_OBJID, PM.PART_NO, PM.PART_NAME, PM.SOURCE_BOM_TYPE, PM.SOURCE_EBOM_OBJID, PM.SOURCE_MBOM_OBJID, PM.QUANTITY, - -- 총생산수량 = 수주수량 + 추가생산수량 (PRODUCTION_PLAN 테이블) - COALESCE( - (SELECT NULLIF(PP.TOTAL_PROD_QTY, '')::numeric - FROM PRODUCTION_PLAN PP - WHERE PP.PROJECT_OBJID = PM.OBJID - AND UPPER(PP.STATUS) = 'ACTIVE' - LIMIT 1), - COALESCE(NULLIF(PM.QUANTITY, '')::numeric, 0) - ) AS TOTAL_PROD_QTY, COALESCE( (SELECT PBR.PART_NO FROM PART_BOM_REPORT PBR @@ -3303,11 +3293,7 @@ 0 AS PO_QTY, '' AS VENDOR, 0 AS UNIT_PRICE, - 0 AS PROCESSING_UNIT_PRICE, 0 AS TOTAL_PRICE, - -- 소재소요량 계산용 (E-BOM 단계에서는 소재 미선택이므로 0) - 0 AS PART_UNIT_QTY, - 0 AS PART_UNIT_LENGTH, 1 AS LEVEL FROM BOM_PART_QTY BPQ @@ -3387,11 +3373,7 @@ 0 AS PO_QTY, '' AS VENDOR, 0 AS UNIT_PRICE, - 0 AS PROCESSING_UNIT_PRICE, 0 AS TOTAL_PRICE, - -- 소재소요량 계산용 (E-BOM 단계에서는 소재 미선택이므로 0) - 0 AS PART_UNIT_QTY, - 0 AS PART_UNIT_LENGTH, 1 AS LEVEL FROM PROJECT_MGMT PROJ @@ -3406,25 +3388,31 @@ BPQ.SEQ - + @@ -3438,7 +3426,6 @@ MH.BEFORE_DATA, MH.AFTER_DATA, MH.CHANGE_USER, - USER_NAME(MH.CHANGE_USER) AS CHANGE_USER_NAME, TO_CHAR(MH.CHANGE_DATE, 'YYYY-MM-DD HH24:MI:SS') AS CHANGE_DATE, -- MBOM_HEADER 정보 조인 MHD.MBOM_NO AS MBOM_PART_NO, @@ -3756,21 +3743,6 @@ (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('3D_CAD')) AS CU01_CNT, (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('2D_DRAWING_CAD')) AS CU02_CNT, (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('2D_PDF_CAD')) AS CU03_CNT, - -- 소재소요량 계산용: 소재품번(RAW_MATERIAL_PART_NO)에 해당하는 PART_MNG의 UNIT_QTY / UNIT_LENGTH - COALESCE( - (SELECT NULLIF(MP.UNIT_QTY, '')::numeric - FROM PART_MNG MP - WHERE MP.PART_NO = V.RAW_MATERIAL_PART_NO - LIMIT 1), - 0 - ) AS PART_UNIT_QTY, - COALESCE( - (SELECT NULLIF(MP.UNIT_LENGTH, '')::numeric - FROM PART_MNG MP - WHERE MP.PART_NO = V.RAW_MATERIAL_PART_NO - LIMIT 1), - 0 - ) AS PART_UNIT_LENGTH, V.LEV FROM VIEW_BOM V LEFT JOIN PART_MNG P ON V.PART_OBJID = P.OBJID @@ -3876,7 +3848,7 @@ PROCESSING_VENDOR, PROCESSING_DEADLINE, GRINDING_DEADLINE, REQUIRED_QTY, ORDER_QTY, PRODUCTION_QTY, STOCK_QTY, SHORTAGE_QTY, NET_QTY, PO_QTY, - VENDOR, UNIT_PRICE, PROCESSING_UNIT_PRICE, TOTAL_PRICE, CURRENCY, LEAD_TIME, MIN_ORDER_QTY, + VENDOR, UNIT_PRICE, TOTAL_PRICE, CURRENCY, LEAD_TIME, MIN_ORDER_QTY, PROPOSAL_DATE, @@ -3889,7 +3861,7 @@ #{processingVendor}, #{processingDeadline}, #{grindingDeadline}, #{requiredQty}, #{orderQty}, #{productionQty}, #{stockQty}, #{shortageQty}, #{netQty}, #{poQty}, - #{vendor}, #{unitPrice}, #{processingUnitPrice}, #{totalPrice}, #{currency}, #{leadTime}, #{minOrderQty}, + #{vendor}, #{unitPrice}, #{totalPrice}, #{currency}, #{leadTime}, #{minOrderQty}, #{proposalDate}, @@ -4075,7 +4047,6 @@ MD.PO_QTY, MD.VENDOR, MD.UNIT_PRICE, - MD.PROCESSING_UNIT_PRICE, MD.TOTAL_PRICE, MD.CURRENCY, MD.LEAD_TIME, @@ -4129,7 +4100,6 @@ SHORTAGE_QTY, VENDOR, UNIT_PRICE, - PROCESSING_UNIT_PRICE, TOTAL_PRICE, CURRENCY, LEAD_TIME, @@ -4174,7 +4144,6 @@ A.SHORTAGE_QTY, A.VENDOR, A.UNIT_PRICE, - A.PROCESSING_UNIT_PRICE, A.TOTAL_PRICE, A.CURRENCY, A.LEAD_TIME, @@ -4227,7 +4196,6 @@ B.SHORTAGE_QTY, B.VENDOR, B.UNIT_PRICE, - B.PROCESSING_UNIT_PRICE, B.TOTAL_PRICE, B.CURRENCY, B.LEAD_TIME, @@ -4280,7 +4248,6 @@ V.VENDOR, (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME, V.UNIT_PRICE, - V.PROCESSING_UNIT_PRICE, V.TOTAL_PRICE, V.CURRENCY, V.LEAD_TIME, @@ -4318,21 +4285,6 @@ (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('3D_CAD')) AS CU01_CNT, (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('2D_DRAWING_CAD')) AS CU02_CNT, (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('2D_PDF_CAD')) AS CU03_CNT, - -- 소재소요량 계산용: 소재품번(RAW_MATERIAL_PART_NO)에 해당하는 PART_MNG의 UNIT_QTY / UNIT_LENGTH - COALESCE( - (SELECT NULLIF(MP.UNIT_QTY, '')::numeric - FROM PART_MNG MP - WHERE MP.PART_NO = V.RAW_MATERIAL_PART_NO - LIMIT 1), - 0 - ) AS PART_UNIT_QTY, - COALESCE( - (SELECT NULLIF(MP.UNIT_LENGTH, '')::numeric - FROM PART_MNG MP - WHERE MP.PART_NO = V.RAW_MATERIAL_PART_NO - LIMIT 1), - 0 - ) AS PART_UNIT_LENGTH, V.LEV FROM VIEW_BOM V INNER JOIN PART_MNG P ON P.OBJID = V.PART_OBJID @@ -4362,8 +4314,7 @@ PATH2, CYCLE, UNIT, - WRITER, - RAW_MATERIAL_PART_NO + WRITER ) AS ( SELECT A.MBOM_HEADER_OBJID, @@ -4384,8 +4335,7 @@ ARRAY [A.SEQ::TEXT], FALSE, A.UNIT, - A.WRITER, - A.RAW_MATERIAL_PART_NO + A.WRITER FROM MBOM_DETAIL A WHERE 1=1 @@ -4414,8 +4364,7 @@ PATH2||B.SEQ::TEXT, B.PARENT_OBJID = ANY(PATH), B.UNIT, - B.WRITER, - B.RAW_MATERIAL_PART_NO + B.WRITER FROM MBOM_DETAIL B JOIN @@ -4461,7 +4410,6 @@ NULL AS SHORTAGE_QTY, NULL AS VENDOR, NULL AS UNIT_PRICE, - NULL AS PROCESSING_UNIT_PRICE, NULL AS TOTAL_PRICE, NULL AS CURRENCY, NULL AS LEAD_TIME, @@ -4497,21 +4445,6 @@ (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('3D_CAD')) AS CU01_CNT, (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('2D_DRAWING_CAD')) AS CU02_CNT, (SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.STATUS = 'Active' AND F.DOC_TYPE IN ('2D_PDF_CAD')) AS CU03_CNT, - -- 소재소요량 계산용: 소재품번(RAW_MATERIAL_PART_NO)에 해당하는 PART_MNG의 UNIT_QTY / UNIT_LENGTH - COALESCE( - (SELECT NULLIF(MP.UNIT_QTY, '')::numeric - FROM PART_MNG MP - WHERE MP.PART_NO = V.RAW_MATERIAL_PART_NO - LIMIT 1), - 0 - ) AS PART_UNIT_QTY, - COALESCE( - (SELECT NULLIF(MP.UNIT_LENGTH, '')::numeric - FROM PART_MNG MP - WHERE MP.PART_NO = V.RAW_MATERIAL_PART_NO - LIMIT 1), - 0 - ) AS PART_UNIT_LENGTH, V.LEV FROM VIEW_BOM V INNER JOIN PART_MNG P ON P.OBJID = V.PART_OBJID @@ -4580,18 +4513,9 @@ COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'ASSEMBLY' AND PR.STATUS = 'active'), 0) AS ASSEMBLY_QTY, COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'INSPECTION' AND PR.STATUS = 'active'), 0) AS INSPECTION_QTY, COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PM.OBJID::VARCHAR AND PR.RESULT_TYPE = 'SHIP_WAIT' AND PR.STATUS = 'active'), 0) AS SHIP_WAIT_QTY, - -- '' AS EQUIPMENT_WBS, - (SELECT COUNT(1) FROM PMS_WBS_TASK AS O WHERE O.CONTRACT_OBJID = PM.OBJID AND ( - O.PRODUCE_PLAN_START !='' OR O.PRODUCE_PLAN_END !='' OR O.PRODUCE_ACT_START!='' OR O.PRODUCE_ACT_END !='' OR O.PRODUCE_USER_ID !='' - OR O.DESIGN_USER_ID !='' OR O.DESIGN_PLAN_START !='' OR O.DESIGN_PLAN_END !='' OR O.DESIGN_ACT_START !='' OR O.DESIGN_ACT_END !='' - OR O.PURCHASE_USER_ID !='' OR O.PURCHASE_PLAN_START !='' OR O.PURCHASE_PLAN_END !='' OR O.PURCHASE_ACT_START !='' OR O.PURCHASE_ACT_END !='' - )) AS EQUIPMENT_WBS, + '' AS EQUIPMENT_WBS, PP.OBJID AS PROD_PLAN_OBJID, - PM.REGDATE AS SORT_DATE, - PP.WRITER, - USER_NAME(PP.WRITER) AS WRITER_NAME, - TO_CHAR(PP.REGDATE, 'YYYY-MM-DD') AS REGDATE_TITLE, - PP.REGDATE + PM.REGDATE AS SORT_DATE FROM PROJECT_MGMT PM LEFT JOIN CONTRACT_MGMT CM ON PM.CONTRACT_OBJID = CM.OBJID @@ -4639,13 +4563,9 @@ COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'ASSEMBLY' AND PR.STATUS = 'active'), 0) AS ASSEMBLY_QTY, COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'INSPECTION' AND PR.STATUS = 'active'), 0) AS INSPECTION_QTY, COALESCE((SELECT SUM(RESULT_QTY) FROM PRODUCTION_RESULT PR WHERE PR.PROJECT_OBJID = PP.OBJID::VARCHAR AND PR.RESULT_TYPE = 'SHIP_WAIT' AND PR.STATUS = 'active'), 0) AS SHIP_WAIT_QTY, - 0 AS EQUIPMENT_WBS, + '' AS EQUIPMENT_WBS, PP.OBJID AS PROD_PLAN_OBJID, - PP.REGDATE AS SORT_DATE, - PP.WRITER, - USER_NAME(PP.WRITER) AS WRITER_NAME, - TO_CHAR(PP.REGDATE, 'YYYY-MM-DD') AS REGDATE_TITLE, - PP.REGDATE + PP.REGDATE AS SORT_DATE FROM PRODUCTION_PLAN PP WHERE PP.STATUS = 'active' AND (PP.PROJECT_OBJID IS NULL OR PP.PROJECT_OBJID = '') @@ -4697,17 +4617,6 @@ AND UPPER(T.SERIAL_NO) LIKE '%' || UPPER(#{search_serial_no}) || '%' - - - AND T.WRITER = #{search_writer} - - - - AND T.REGDATE >= TO_DATE(#{search_regdate_from}, 'YYYY-MM-DD') - - - AND T.REGDATE <= TO_DATE(#{search_regdate_to}, 'YYYY-MM-DD') - ORDER BY T.SORT_DATE DESC, T.PROJECT_NO DESC @@ -4726,7 +4635,7 @@ COALESCE(CI.DUE_DATE, PM.DUE_DATE, CM.REQ_DEL_DATE, '') AS REQ_DEL_DATE, COALESCE(NULLIF(PM.QUANTITY, '')::numeric, 0) AS ORDER_QTY, COALESCE((SELECT NULLIF(PP.EXTRA_PROD_QTY, '')::numeric FROM PRODUCTION_PLAN PP WHERE PP.PROJECT_OBJID = PM.OBJID AND UPPER(PP.STATUS) = 'ACTIVE' LIMIT 1), 0) AS EXTRA_PROD_QTY, - COALESCE(CI.CUSTOMER_REQUEST, CM.CUSTOMER_REQUEST, '') AS CUSTOMER_REQUEST, + COALESCE(CM.CUSTOMER_REQUEST, '') AS CUSTOMER_REQUEST, COALESCE(( SELECT STRING_AGG(CIS.SERIAL_NO, ', ' ORDER BY CIS.SERIAL_NO) FROM CONTRACT_ITEM_SERIAL CIS @@ -4780,9 +4689,8 @@ PP.TOTAL_PROD_QTY, PP.CUSTOMER_REQUEST, PP.STATUS, - TO_CHAR(PP.REGDATE, 'YYYY-MM-DD') AS REGDATE, - PP.WRITER, - (SELECT USER_NAME FROM USER_INFO WHERE USER_ID = PP.WRITER) AS WRITER_NAME + PP.REGDATE, + PP.WRITER FROM PRODUCTION_PLAN PP WHERE PP.OBJID = #{objid} @@ -5023,93 +4931,4 @@ WHERE PROJECT_OBJID = #{projectObjid} - - - - - - diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml index d6dfb64..56624c4 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml @@ -879,10 +879,10 @@ SELECT SRP.OBJID, SRP.PART_OBJID, - COALESCE(NULLIF(SRP.QTY::VARCHAR, ''), '0') AS QTY, - COALESCE(NULLIF(SRP.QTY::VARCHAR, ''), '0') AS ORDER_QTY, - COALESCE(SRP.UNIT_PRICE, 0) AS PARTNER_PRICE, - COALESCE(SRP.TOTAL_PRICE, 0) AS TOTAL_PRICE, + SRP.QTY, + COALESCE(SRP.PO_QTY, SRP.QTY::NUMERIC, 0) AS ORDER_QTY, -- 발주수량 (PO_QTY 우선, 없으면 QTY) + SRP.UNIT_PRICE AS PARTNER_PRICE, + SRP.TOTAL_PRICE, SRP.VENDOR_PM AS PARTNER_OBJID, PM.PART_NO, PM.PART_NAME, @@ -1193,7 +1193,7 @@ #{PART_OBJID}, REPLACE(#{BOM_QTY}::VARCHAR, ',', ''), REPLACE(#{QTY}::VARCHAR, ',', ''), - COALESCE(NULLIF(REPLACE(#{ORDER_QTY}::VARCHAR, ',', ''), '')::NUMERIC::INTEGER, 0), + REPLACE(#{ORDER_QTY}::VARCHAR, ',', ''), #{PARTNER_PRICE}, #{REMARK}, #{WRITER}, @@ -1231,7 +1231,7 @@ ) ON CONFLICT (OBJID) DO UPDATE SET - ORDER_QTY = COALESCE(NULLIF(REPLACE(#{ORDER_QTY}::VARCHAR, ',', ''), '')::NUMERIC::INTEGER, 0) + ORDER_QTY = REPLACE(#{ORDER_QTY} ::VARCHAR, ',', '') ,PARTNER_PRICE = REPLACE(#{PARTNER_PRICE} ::VARCHAR, ',', '') ,REMARK = #{REMARK} FROM( SELECT ROW_NUMBER() OVER(ORDER BY PM.PART_NO, POP.REGDATE DESC) AS RNUM, @@ -1854,7 +1855,7 @@ WHEN POM.PARTNER_OBJID LIKE 'C_%' THEN (SELECT CLIENT_NM FROM CLIENT_MNG WHERE 'C_' || OBJID::VARCHAR = POM.PARTNER_OBJID) ELSE (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE 1=1 AND OBJID::VARCHAR = POM.PARTNER_OBJID) END AS PARTNER_NAME, - COALESCE(NULLIF(POP.ORDER_QTY::VARCHAR, '')::NUMERIC::INTEGER, 0) AS ORDER_QTY, + POP.ORDER_QTY, POP.REAL_ORDER_QTY, POP.OBJID AS ORDER_PART_OBJID, POP.PURCHASE_ORDER_MASTER_OBJID, @@ -3230,8 +3231,6 @@ SELECT POM.OBJID ,POM.TOTAL_SUPPLY_UNIT_PRICE ,POM.TOTAL_REAL_SUPPLY_PRICE ,POM.NEGO_RATE - ,POM.WRITER - ,(SELECT USER_NAME FROM USER_INFO WHERE USER_ID = POM.WRITER) AS WRITER_NAME @@ -3318,7 +3317,7 @@ SELECT POM.OBJID ON POM.CONTRACT_MGMT_OBJID = CM.OBJID left outer join SALES_REQUEST_MASTER as SRM on POM.SALES_REQUEST_OBJID = SRM.OBJID - and SRM.DOC_TYPE IN ('PROPOSAL', 'PURCHASE_REG_PROPOSAL') + and SRM.DOC_TYPE = 'PROPOSAL' - - AND SRM.PURCHASE_TYPE = #{purchase_type} - - - - AND POM.WRITER = #{writer} - - - - - - AND POM.MAIL_SEND_YN = 'Y' - AND (POM.STATUS IS NULL OR POM.STATUS != 'orderCancel') - - - AND POM.STATUS = 'orderCancel' - - - AND (POM.MAIL_SEND_YN IS NULL OR POM.MAIL_SEND_YN = '' OR POM.MAIL_SEND_YN = 'N') - AND (POM.STATUS IS NULL OR POM.STATUS != 'orderCancel') - - - ORDER BY SPLIT_PART( PURCHASE_ORDER_NO, '-', 3)::NUMERIC DESC @@ -4271,7 +4246,6 @@ SELECT T.* - - - - - - UPDATE PURCHASE_ORDER_MASTER - SET STATUS = #{STATUS} - WHERE OBJID = #{OBJID} - - - - - UPDATE PURCHASE_ORDER_MASTER - SET STATUS = #{STATUS} - WHERE MULTI_MASTER_OBJID = #{OBJID} - - - - - \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml index faa0ba2..e290c55 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/quality.xml @@ -1208,12 +1208,6 @@ AND (SELECT CASE WHEN COUNT(CASE WHEN PID.INSPECTION_RESULT = 'NG' THEN 1 END) > 0 THEN 'NG' ELSE 'OK' END FROM PROCESS_INSPECTION_DETAIL PID WHERE PID.MASTER_OBJID = PIM.OBJID) = #{search_inspection_result} - /* 진행공정 */ - - AND EXISTS (SELECT 1 FROM PROCESS_INSPECTION_DETAIL PID - WHERE PID.MASTER_OBJID = PIM.OBJID - AND PID.PROCESS_CD = #{search_process_cd}) - ORDER BY PIM.REG_DATE DESC @@ -1417,10 +1411,6 @@ AND PID.INSPECTION_RESULT = #{search_inspection_result} - /* 진행공정 */ - - AND PID.PROCESS_CD = #{search_process_cd} - ORDER BY PIM.INSPECTION_DATE DESC, PIM.REG_DATE DESC, PID.REG_DATE @@ -1428,96 +1418,8 @@ 반제품검사 관리 ===================================================== --> - + - - - - - - - - - - - + SELECT NEXTVAL('SEQ_CUSTOMER_CS_RECEIPT_NO') @@ -2178,7 +2026,6 @@ , STATUS , REMARK , WRITER - , RECEIPT_USER_ID , REG_DATE ) VALUES ( #{OBJID} @@ -2200,7 +2047,6 @@ , #{STATUS} , #{REMARK} , #{WRITER} - , #{RECEIPT_USER_ID} , NOW() ) @@ -2221,7 +2067,6 @@ , SERIAL_NO = #{SERIAL_NO} , MANUFACTURER = #{MANUFACTURER} , COMPLAINT_CONTENT = #{COMPLAINT_CONTENT} - , RECEIPT_USER_ID = #{RECEIPT_USER_ID} , MOD_DATE = NOW() WHERE OBJID = #{OBJID} @@ -2240,18 +2085,6 @@ WHERE OBJID = #{OBJID} - - - DELETE FROM CUSTOMER_CS WHERE OBJID = #{OBJID} - - - - - DELETE FROM ATTACH_FILE_INFO - WHERE TARGET_OBJID = #{OBJID} - AND DOC_TYPE IN ('CUSTOMER_CS_IMAGE', 'CUSTOMER_CS_ACTION') - - @@ -2279,19 +2112,7 @@ , (SELECT COUNT(*) FROM ATTACH_FILE_INFO AFI WHERE AFI.TARGET_OBJID = ECR.OBJID AND AFI.DOC_TYPE = 'ECR_RESULT' AND STATUS = 'Active') AS ATTACH_FILE , (SELECT COUNT(*) FROM ATTACH_FILE_INFO AFI WHERE AFI.TARGET_OBJID = ECR.OBJID AND AFI.DOC_TYPE = 'ECR_DOC' AND STATUS = 'Active') AS ECR_DOC_FILE , CASE WHEN (ECR.ECR_DOC_SUMMARY IS NOT NULL AND ECR.ECR_DOC_SUMMARY != '') OR (ECR.ECR_DOC_REASON IS NOT NULL AND ECR.ECR_DOC_REASON != '') THEN 1 ELSE 0 END AS ECR_DOC_CNT - , ECR.CHANGE_TYPE - , CODE_NAME(ECR.CHANGE_TYPE) AS CHANGE_TYPE_NAME - , COALESCE(AMR.STATUS, '') AS AMARANTH_STATUS - , CASE - WHEN AMR.STATUS = 'complete' THEN '결재완료' - WHEN AMR.STATUS = 'inProcess' THEN '결재 상신중' - WHEN AMR.STATUS = 'reject' THEN '반려' - ELSE '' - END AS AMARANTH_STATUS_TITLE FROM PMS_QUALITY_ECR ECR - LEFT OUTER JOIN AMARANTH_APPROVAL AMR - ON ECR.OBJID::VARCHAR = AMR.TARGET_OBJID - AND AMR.TARGET_TYPE = 'ECR' WHERE 1=1 AND ECR.REQUEST_DATE >= #{search_request_date_from} @@ -2338,9 +2159,6 @@ AND ECR.COMPLETE_DATE #{search_complete_date_to} - - AND ECR.CHANGE_TYPE = #{search_change_type} - ORDER BY ECR.REQUEST_DATE DESC, ECR.REG_DATE DESC @@ -2374,8 +2192,6 @@ , ECR.ECR_REV_DATE , ECR.ECR_DOC_FORM_NO , ECR.ECR_DOC_AUTHOR - , ECR.CHANGE_TYPE - , (SELECT CODE_NAME FROM COMM_CODE WHERE CODE_ID = ECR.CHANGE_TYPE) AS CHANGE_TYPE_NAME FROM PMS_QUALITY_ECR ECR WHERE ECR.OBJID = #{OBJID} @@ -2401,7 +2217,6 @@ , DUE_DATE , ACTION_DEPT , ACTION_MANAGER_ID - , CHANGE_TYPE , ATTACH_FILE_OBJID , REMARK , WRITER @@ -2418,7 +2233,6 @@ , #{DUE_DATE} , #{ACTION_DEPT} , #{ACTION_MANAGER_ID} - , #{CHANGE_TYPE} , #{ATTACH_FILE_OBJID} , #{REMARK} , #{WRITER} @@ -2438,7 +2252,6 @@ , DUE_DATE = #{DUE_DATE} , ACTION_DEPT = #{ACTION_DEPT} , ACTION_MANAGER_ID = #{ACTION_MANAGER_ID} - , CHANGE_TYPE = #{CHANGE_TYPE} , REMARK = #{REMARK} , MODIFIER = #{WRITER} , MOD_DATE = NOW() @@ -2479,14 +2292,6 @@ SELECT IMI.OBJID , IMI.PARENT_OBJID , IM.PART_OBJID - /* 제품구분: PROJECT_MGMT.PRODUCT (코드명 조회) */ - , COALESCE((SELECT CODE_NAME(PJM.PRODUCT) FROM SALES_REQUEST_MASTER SRM2 - LEFT JOIN PROJECT_MGMT PJM ON PJM.OBJID::VARCHAR = SRM2.PROJECT_NO - WHERE SRM2.OBJID = POM.SALES_REQUEST_OBJID), '') AS PRODUCT_TYPE - /* 품명(모델명): PROJECT_MGMT.PART_NAME */ - , COALESCE((SELECT PJM.PART_NAME FROM SALES_REQUEST_MASTER SRM2 - LEFT JOIN PROJECT_MGMT PJM ON PJM.OBJID::VARCHAR = SRM2.PROJECT_NO - WHERE SRM2.OBJID = POM.SALES_REQUEST_OBJID), '') AS MODEL_NAME , PM.PART_NO , PM.PART_NAME , COALESCE(IMI.RECEIPT_DATE, TO_CHAR(IMI.REGDATE, 'YYYY-MM-DD')) AS DELIVERY_DATE @@ -2538,7 +2343,7 @@ ORDER BY IMI.REGDATE, PM.PART_NO - + - - - - + - - - INSERT INTO INCOMING_INSPECTION_DETAIL ( @@ -2914,12 +2558,4 @@ WHERE INSPECTION_DETAIL_OBJID = #{INSPECTION_DETAIL_OBJID} - - - UPDATE INCOMING_INSPECTION_DETAIL - SET DEFECT_QTY = #{DEFECT_QTY} - , MOD_DATE = NOW() - WHERE OBJID = #{OBJID} - - \ No newline at end of file diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml b/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml index 27b856e..3061ba6 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/salesMng.xml @@ -3161,8 +3161,7 @@ UPDATE SET COALESCE(PM.HEAT_TREATMENT_HARDNESS, '') AS HEAT_TREATMENT_HARDNESS, COALESCE(PM.HEAT_TREATMENT_METHOD, '') AS HEAT_TREATMENT_METHOD, COALESCE(PM.SURFACE_TREATMENT, '') AS SURFACE_TREATMENT, - COALESCE(PM.MAKER, '') AS MAKER, - '' AS VENDOR, + COALESCE(PM.MAKER, '') AS VENDOR, (SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = PM.PART_TYPE) AS PART_TYPE_TITLE, '' AS SUPPLY_TYPE, '' AS RAW_MATERIAL, @@ -3172,7 +3171,7 @@ UPDATE SET 0 AS ORDER_QTY, 0 AS ITEM_QTY2, 0 AS PRODUCTION_QTY, - CASE WHEN SRP.PROCESSING_VENDOR IS NULL THEN '0000008377' ELSE SRP.PROCESSING_VENDOR END AS PROCESSING_VENDOR, + COALESCE(SRP.PROCESSING_VENDOR, '') AS PROCESSING_VENDOR, NULL AS PROCESSING_DEADLINE, NULL AS GRINDING_DEADLINE, -- 구매 관련 컬럼 (SALES_REQUEST_PART에서 조회) @@ -3463,7 +3462,7 @@ SELECT G.RAW_MATERIAL_SPEC, G.RAW_MATERIAL, G.RAW_MATERIAL_SIZE AS SIZE, - CASE WHEN G.PROCESSING_VENDOR IS NULL THEN '0000008377' ELSE G.PROCESSING_VENDOR END AS PROCESSING_VENDOR, + G.PROCESSING_VENDOR, G.PROCESSING_DEADLINE, G.GRINDING_DEADLINE, G.REQUIRED_QTY, @@ -3472,7 +3471,7 @@ SELECT G.STOCK_QTY, G.SHORTAGE_QTY, G.VENDOR AS VENDOR_PM, - (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = G.VENDOR) AS VENDOR_NAME, + (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE OBJID::VARCHAR = G.VENDOR) AS VENDOR_NAME, G.UNIT_PRICE, G.TOTAL_PRICE, G.CURRENCY, @@ -3493,8 +3492,7 @@ SELECT P.WEIGHT, P.PART_TYPE, P.REVISION, - COALESCE(P.MAKER, '') AS MAKER, - G.VENDOR AS VENDOR, + COALESCE(P.MAKER, G.VENDOR) AS VENDOR, P.THICKNESS, P.WIDTH, P.HEIGHT, @@ -3736,7 +3734,7 @@ SELECT V.STOCK_QTY, V.SHORTAGE_QTY, V.VENDOR AS VENDOR_PM, - (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME, + (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME, V.UNIT_PRICE, V.TOTAL_PRICE, V.CURRENCY, @@ -3759,8 +3757,7 @@ SELECT P.WEIGHT, P.PART_TYPE, P.REVISION, - COALESCE(P.MAKER, '') AS MAKER, - V.VENDOR AS VENDOR, + COALESCE(P.MAKER, V.VENDOR) AS VENDOR, P.THICKNESS, P.WIDTH, P.HEIGHT, @@ -3900,43 +3897,21 @@ ORDER BY V.PATH2 - - - + - - - + - - - - + - - + - SELECT ROW_NUMBER() OVER(ORDER BY SRP.REGDATE) AS RNUM, SRP.OBJID, @@ -4901,17 +4809,14 @@ ORDER BY V.PATH2 PM.PART_NAME, PM.SPEC, PM.MATERIAL, - COALESCE(SRP.UNIT, PM.UNIT) AS UNIT, + SRP.UNIT, COALESCE( (SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = SRP.UNIT), (SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = PM.UNIT) ) AS UNIT_TITLE, SRP.QTY, - COALESCE(SRP.UNIT_PRICE, 0) AS UNIT_PRICE, - CASE - WHEN COALESCE(SRP.TOTAL_PRICE::NUMERIC, 0) > 0 THEN SRP.TOTAL_PRICE::NUMERIC - ELSE COALESCE(SRP.QTY::NUMERIC, 0) * COALESCE(SRP.UNIT_PRICE::NUMERIC, 0) - END AS TOTAL_PRICE, + SRP.UNIT_PRICE, + SRP.TOTAL_PRICE, SRP.VENDOR_PM, (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = SRP.VENDOR_PM) AS VENDOR_NAME, SRP.REMARK, @@ -4968,35 +4873,6 @@ ORDER BY V.PATH2 WHERE MD.OBJID = #{OBJID} - - - @@ -5097,7 +4973,7 @@ ORDER BY V.PATH2 LEFT JOIN SALES_REQUEST_MASTER SRM ON QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = SRM.OBJID::VARCHAR LEFT JOIN PROJECT_MGMT PM ON PM.OBJID = SRM.PROJECT_NO LEFT JOIN CONTRACT_MGMT CTM ON CTM.OBJID = PM.CONTRACT_OBJID - LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID = CM.OBJID::VARCHAR + LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID::VARCHAR = CM.OBJID::VARCHAR WHERE 1=1 AND QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = #{SALES_REQUEST_MASTER_OBJID} @@ -5116,16 +4992,8 @@ ORDER BY V.PATH2 AND QRM.VENDOR_OBJID::VARCHAR = #{VENDOR_OBJID} - - - - - AND QRM.MAIL_SEND_DATE IS NOT NULL - - - AND QRM.MAIL_SEND_DATE IS NULL - - + + AND QRM.STATUS = #{STATUS} @@ -5181,7 +5049,7 @@ ORDER BY V.PATH2 LEFT JOIN SALES_REQUEST_MASTER SRM ON QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = SRM.OBJID::VARCHAR LEFT JOIN PROJECT_MGMT PM ON PM.OBJID = SRM.PROJECT_NO LEFT JOIN CONTRACT_MGMT CTM ON CTM.OBJID = PM.CONTRACT_OBJID - LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID = CM.OBJID::VARCHAR + LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID::VARCHAR = CM.OBJID::VARCHAR WHERE QRM.OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC @@ -5200,25 +5068,16 @@ ORDER BY V.PATH2 QRD.UNIT_PRICE, QRD.REMARK, QRD.REG_DATE, - QRD.DELIVERY_REQUEST_DATE, -- 마스터 정보 QRM.VENDOR_TYPE, QRM.VENDOR_OBJID, - (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = QRM.VENDOR_OBJID) AS VENDOR_NAME + (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = QRM.VENDOR_OBJID::VARCHAR) AS VENDOR_NAME FROM QUOTATION_REQUEST_DETAIL QRD LEFT JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID WHERE QRD.QUOTATION_REQUEST_MASTER_OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC ORDER BY QRD.OBJID - - - - WITH GROUPED_MBOM AS ( - SELECT - MIN(MD.OBJID) AS OBJID, - STRING_AGG(MD.OBJID::VARCHAR, ',' ORDER BY MD.OBJID) AS ORIGINAL_OBJIDS, - MD.PART_OBJID, - MIN(PM.PART_NO) AS PART_NO, - MIN(PM.PART_NAME) AS PART_NAME, - COALESCE(MIN(MD.RAW_MATERIAL), '') AS RAW_MATERIAL, - COALESCE(MIN(MD.RAW_MATERIAL_SIZE), '') AS SIZE, - SUM(COALESCE(MD.PO_QTY, 0)) AS PO_QTY, - SUM(COALESCE(MD.PRODUCTION_QTY, 0)) AS PRODUCTION_QTY, - MIN(MD.UNIT_PRICE) AS UNIT_PRICE, - MIN(MD.PROCESSING_UNIT_PRICE) AS PROCESSING_UNIT_PRICE, - MIN(MD.VENDOR) AS VENDOR_PM, - MIN(MD.PROCESSING_VENDOR) AS PROCESSING_VENDOR, - MIN(MD.RAW_MATERIAL_PART_NO) AS RAW_MATERIAL_NO - FROM MBOM_DETAIL MD - LEFT JOIN PART_MNG PM ON MD.PART_OBJID::VARCHAR = PM.OBJID::VARCHAR - WHERE MD.MBOM_HEADER_OBJID = #{MBOM_HEADER_OBJID} - AND ( - (MD.VENDOR IS NOT NULL AND MD.VENDOR != '') - OR (MD.PROCESSING_VENDOR IS NOT NULL AND MD.PROCESSING_VENDOR != '') - ) - GROUP BY MD.PART_OBJID, - COALESCE(MD.SUPPLY_TYPE, ''), - COALESCE(MD.RAW_MATERIAL, ''), - COALESCE(MD.RAW_MATERIAL_SIZE, '') - ) SELECT - G.OBJID, - G.ORIGINAL_OBJIDS, + MD.OBJID, #{SALES_REQUEST_MASTER_OBJID} AS SALES_REQUEST_MASTER_OBJID, - G.PART_OBJID, - G.PART_NO, - G.PART_NAME, - G.RAW_MATERIAL, - G.SIZE, - G.PO_QTY, - G.PRODUCTION_QTY, - G.UNIT_PRICE, - G.PROCESSING_UNIT_PRICE, - G.VENDOR_PM, - (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = G.VENDOR_PM) AS VENDOR_NAME, - G.PROCESSING_VENDOR, - (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = G.PROCESSING_VENDOR) AS PROCESSING_VENDOR_NAME, - G.RAW_MATERIAL_NO, + MD.PART_OBJID, + PM.PART_NO, + PM.PART_NAME, + MD.RAW_MATERIAL, + MD.RAW_MATERIAL_SIZE AS SIZE, + MD.PO_QTY, + MD.PRODUCTION_QTY, + MD.UNIT_PRICE, + MD.PROCESSING_UNIT_PRICE, + MD.VENDOR AS VENDOR_PM, + (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = MD.VENDOR) AS VENDOR_NAME, + MD.PROCESSING_VENDOR, + (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = MD.PROCESSING_VENDOR) AS PROCESSING_VENDOR_NAME, + MD.RAW_MATERIAL_PART_NO AS RAW_MATERIAL_NO, 'MBOM' AS DATA_SOURCE, - CASE WHEN G.VENDOR_PM IS NOT NULL AND G.VENDOR_PM != '' AND NOT EXISTS ( + -- 공급업체 견적요청서 생성 가능 여부 + CASE WHEN MD.VENDOR IS NOT NULL AND MD.VENDOR != '' AND NOT EXISTS ( SELECT 1 FROM QUOTATION_REQUEST_DETAIL QRD INNER JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID - WHERE QRD.SALES_REQUEST_PART_OBJID = G.OBJID + WHERE QRD.SALES_REQUEST_PART_OBJID::VARCHAR = MD.OBJID::VARCHAR AND QRM.VENDOR_TYPE = 'SUPPLY' - AND QRM.VENDOR_OBJID::VARCHAR = G.VENDOR_PM + AND QRM.VENDOR_OBJID::VARCHAR = MD.VENDOR ) THEN 'Y' ELSE 'N' END AS CAN_CREATE_SUPPLY, - CASE WHEN G.PROCESSING_VENDOR IS NOT NULL AND G.PROCESSING_VENDOR != '' AND NOT EXISTS ( + -- 가공업체 견적요청서 생성 가능 여부 + CASE WHEN MD.PROCESSING_VENDOR IS NOT NULL AND MD.PROCESSING_VENDOR != '' AND NOT EXISTS ( SELECT 1 FROM QUOTATION_REQUEST_DETAIL QRD INNER JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID - WHERE QRD.SALES_REQUEST_PART_OBJID = G.OBJID + WHERE QRD.SALES_REQUEST_PART_OBJID::VARCHAR = MD.OBJID::VARCHAR AND QRM.VENDOR_TYPE = 'PROCESSING' - AND QRM.VENDOR_OBJID::VARCHAR = G.PROCESSING_VENDOR + AND QRM.VENDOR_OBJID::VARCHAR = MD.PROCESSING_VENDOR ) THEN 'Y' ELSE 'N' END AS CAN_CREATE_PROCESSING - FROM GROUPED_MBOM G - WHERE ( - (G.VENDOR_PM IS NOT NULL AND G.VENDOR_PM != '' AND NOT EXISTS ( + FROM MBOM_DETAIL MD + LEFT JOIN PART_MNG PM ON MD.PART_OBJID::VARCHAR = PM.OBJID::VARCHAR + WHERE MD.MBOM_HEADER_OBJID = #{MBOM_HEADER_OBJID} + AND ( + (MD.VENDOR IS NOT NULL AND MD.VENDOR != '') + OR (MD.PROCESSING_VENDOR IS NOT NULL AND MD.PROCESSING_VENDOR != '') + ) + -- 공급업체 또는 가공업체 중 하나라도 견적요청서 생성 가능해야 함 + AND ( + -- 공급업체 견적요청서 생성 가능 + (MD.VENDOR IS NOT NULL AND MD.VENDOR != '' AND NOT EXISTS ( SELECT 1 FROM QUOTATION_REQUEST_DETAIL QRD INNER JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID - WHERE QRD.SALES_REQUEST_PART_OBJID = G.OBJID + WHERE QRD.SALES_REQUEST_PART_OBJID::VARCHAR = MD.OBJID::VARCHAR AND QRM.VENDOR_TYPE = 'SUPPLY' - AND QRM.VENDOR_OBJID::VARCHAR = G.VENDOR_PM + AND QRM.VENDOR_OBJID::VARCHAR = MD.VENDOR )) OR - (G.PROCESSING_VENDOR IS NOT NULL AND G.PROCESSING_VENDOR != '' AND NOT EXISTS ( + -- 가공업체 견적요청서 생성 가능 + (MD.PROCESSING_VENDOR IS NOT NULL AND MD.PROCESSING_VENDOR != '' AND NOT EXISTS ( SELECT 1 FROM QUOTATION_REQUEST_DETAIL QRD INNER JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID - WHERE QRD.SALES_REQUEST_PART_OBJID = G.OBJID + WHERE QRD.SALES_REQUEST_PART_OBJID::VARCHAR = MD.OBJID::VARCHAR AND QRM.VENDOR_TYPE = 'PROCESSING' - AND QRM.VENDOR_OBJID::VARCHAR = G.PROCESSING_VENDOR + AND QRM.VENDOR_OBJID::VARCHAR = MD.PROCESSING_VENDOR )) ) - ORDER BY G.PART_NO + ORDER BY MD.REGDATE 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 83ce317..1e6214b 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -3556,56 +3556,54 @@ SELECT (CASE WHEN GROUPING(cc.code_id) = 1 THEN '소계' ELSE cc.CODE_ID END) AS @@ -3662,20 +3682,23 @@ SELECT year, annual, five SELECT ASM.OBJID - ,ASM.CLIENT_NM + ,ASM.SUPPLY_NAME ,S1.* FROM - CLIENT_MNG ASM + SUPPLY_MNG ASM ,( SELECT CM.CUSTOMER_OBJID @@ -3757,12 +3784,12 @@ FROM FROM CONTRACT_MGMT CM WHERE CM.CONTRACT_RESULT = '0000964' - AND TO_CHAR(TO_DATE(ORDER_DATE,'YYYY-MM-DD'),'YYYY') = #{Year} + AND TO_CHAR(TO_DATE(CONTRACT_DATE,'YYYY-MM-DD'),'YYYY') = #{Year} GROUP BY CM.CUSTOMER_OBJID ) AS S1 WHERE 1=1 - AND 'C_' || ASM.OBJID::VARCHAR = S1.CUSTOMER_OBJID -ORDER BY ASM.CLIENT_NM + AND ASM.OBJID::VARCHAR = S1.CUSTOMER_OBJID +ORDER BY ASM.SUPPLY_NAME diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index 1fb1c24..5c83660 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -2142,102 +2142,6 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC LOADING_DATE = #{loadingDate} WHERE OBJID::VARCHAR = #{OBJID} - - - - - - - - - - - - /* salesNcollectMgmt.updateSlipInfo - 전표 연동 정보 저장 */ - UPDATE PROJECT_MGMT - SET - SALES_STATUS = '완료', - SALES_DEADLINE_DATE = #{deadlineDate}, - SALES_SLIP_DATE = #{slipDate}, - SALES_SLIP_MENU_SQ = #{slipMenuSq} - WHERE OBJID::VARCHAR = #{OBJID} - - + diff --git a/src/com/pms/mapper/approval.xml b/src/com/pms/mapper/approval.xml index 29bc617..78562e9 100644 --- a/src/com/pms/mapper/approval.xml +++ b/src/com/pms/mapper/approval.xml @@ -724,6 +724,7 @@ ET.NOTE3, ET.NOTE4, ET.NOTE_REMARKS, + ET.NOTES_CONTENT, ET.VALIDITY_PERIOD, TO_CHAR(ET.REGDATE, 'YYYY-MM-DD') AS REGDATE, CM.CONTRACT_NO, diff --git a/src/com/pms/mapper/purchaseOrder.xml b/src/com/pms/mapper/purchaseOrder.xml index d6dfb64..dfbe16f 100644 --- a/src/com/pms/mapper/purchaseOrder.xml +++ b/src/com/pms/mapper/purchaseOrder.xml @@ -3476,7 +3476,7 @@ WHERE 1=1 - ORDER BY SPLIT_PART( PURCHASE_ORDER_NO, '-', 3)::NUMERIC DESC + ORDER BY POM.REGDATE DESC