diff --git a/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml b/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml index 0bef751..90d9e45 100644 --- a/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml +++ b/WebContent/WEB-INF/classes/com/pms/mapper/partMng.xml @@ -157,10 +157,11 @@ - SUPPLY_CODE - + P.SUPPLY_CODE, + (SELECT SUPPLY_NAME FROM admin_supply_mng O WHERE O.objid::varchar = P.SUPPLY_CODE) AS SUPPLY_NAME, + P.HEAT_TREATMENT_HARDNESS, + P.HEAT_TREATMENT_METHOD, + P.SURFACE_TREATMENT ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.DOC_TYPE IN ('3D_CAD')) CU01_CNT ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.DOC_TYPE IN ('2D_DRAWING_CAD')) CU02_CNT ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO F WHERE P.OBJID = F.TARGET_OBJID AND F.DOC_TYPE IN ('2D_PDF_CAD')) CU03_CNT @@ -647,9 +648,12 @@ MAKER, POST_PROCESSING, MAJOR_CATEGORY, - SUB_CATEGORY - ) VALUES ( - #{OBJID}::NUMERIC, + SUB_CATEGORY, + HEAT_TREATMENT_HARDNESS, + HEAT_TREATMENT_METHOD, + SURFACE_TREATMENT + ) VALUES ( + #{OBJID}::NUMERIC, #{PRODUCT_MGMT_OBJID}, #{UPG_NO}, #{PART_NO}, @@ -690,9 +694,12 @@ #{MAKER}, #{POST_PROCESSING}, #{MAJOR_CATEGORY}, - #{SUB_CATEGORY} - ) ON - CONFLICT (OBJID) DO + #{SUB_CATEGORY}, + #{HEAT_TREATMENT_HARDNESS}, + #{HEAT_TREATMENT_METHOD}, + #{SURFACE_TREATMENT} + ) ON + CONFLICT (OBJID) DO UPDATE SET PRODUCT_MGMT_OBJID = #{PRODUCT_MGMT_OBJID}, @@ -731,8 +738,11 @@ MAKER = #{MAKER}, POST_PROCESSING = #{POST_PROCESSING}, MAJOR_CATEGORY = #{MAJOR_CATEGORY}, - SUB_CATEGORY = #{SUB_CATEGORY} - + SUB_CATEGORY = #{SUB_CATEGORY}, + HEAT_TREATMENT_HARDNESS = #{HEAT_TREATMENT_HARDNESS}, + HEAT_TREATMENT_METHOD = #{HEAT_TREATMENT_METHOD}, + SURFACE_TREATMENT = #{SURFACE_TREATMENT} + @@ -784,7 +794,11 @@ CODE4, CODE5, IS_NEW, - IS_LONGD + IS_LONGD, + HEAT_TREATMENT_HARDNESS, + HEAT_TREATMENT_METHOD, + SURFACE_TREATMENT, + SUPPLY_CODE ) VALUES ( #{OBJID}::NUMERIC, #{PRODUCT_MGMT_OBJID}, @@ -838,7 +852,11 @@ #{CODE4}, #{CODE5}, #{IS_NEW}, - #{IS_LONGD} + #{IS_LONGD}, + #{HEAT_TREATMENT_HARDNESS}, + #{HEAT_TREATMENT_METHOD}, + #{SURFACE_TREATMENT}, + #{SUPPLY_CODE} ) ON CONFLICT (OBJID) DO UPDATE @@ -885,7 +903,11 @@ CODE4 = #{CODE4}, CODE5 = #{CODE5}, IS_NEW = #{IS_NEW}, - IS_LONGD = #{IS_LONGD} + IS_LONGD = #{IS_LONGD}, + HEAT_TREATMENT_HARDNESS = #{HEAT_TREATMENT_HARDNESS}, + HEAT_TREATMENT_METHOD = #{HEAT_TREATMENT_METHOD}, + SURFACE_TREATMENT = #{SURFACE_TREATMENT}, + SUPPLY_CODE = #{SUPPLY_CODE} INSERT INTO PART_MNG_HISTORY @@ -925,7 +947,11 @@ IN_DIAMETER, LENGTH, CONTRACT_OBJID, - MAKER + MAKER, + HEAT_TREATMENT_HARDNESS, + HEAT_TREATMENT_METHOD, + SURFACE_TREATMENT, + SUPPLY_CODE ) VALUES ( #{OBJID}::NUMERIC, #{PRODUCT_MGMT_OBJID}, @@ -962,7 +988,11 @@ #{IN_DIAMETER}, #{LENGTH}, #{CONTRACT_OBJID}, - #{MAKER} + #{MAKER}, + #{HEAT_TREATMENT_HARDNESS}, + #{HEAT_TREATMENT_METHOD}, + #{SURFACE_TREATMENT}, + #{SUPPLY_CODE} ) ON CONFLICT (OBJID) DO @@ -1000,7 +1030,11 @@ IN_DIAMETER = #{IN_DIAMETER}, LENGTH = #{LENGTH}, CONTRACT_OBJID = (SELECT CONTRACT_OBJID FROM PART_MNG WHERE OBJID = #{OBJID}), - MAKER =#{MAKER} + MAKER =#{MAKER}, + HEAT_TREATMENT_HARDNESS = #{HEAT_TREATMENT_HARDNESS}, + HEAT_TREATMENT_METHOD = #{HEAT_TREATMENT_METHOD}, + SURFACE_TREATMENT = #{SURFACE_TREATMENT}, + SUPPLY_CODE = #{SUPPLY_CODE} + + + UPDATE PART_BOM_REPORT SET NOTE = #{NOTE} @@ -7167,6 +7225,36 @@ SELECT PM.OBJID WHERE 0 ]]> + + + + + + UPDATE PART_BOM_REPORT + SET + PRODUCT_CD = #{product_cd}, + PART_NO = #{part_no}, + PART_NAME = #{part_name}, + REVISION = #{version}, + STATUS = #{status}, + EDITER = #{EDITER}, + EDIT_DATE = NOW() + WHERE + OBJID = #{objId} + +