@ -5,9 +5,9 @@
<mapper namespace= "com.xujie.sys.modules.pms.mapper.EamProjectMapper" >
<insert id= "saveNeweamProject" >
INSERT INTO plm_project_info
(site,bu_no,project_no,ori_project_id,project_category,project_name,project_desc,status,project_source,customer_no,final_customer_id,priority,remark,need_date,c_project_region,project_manager,project_owner,engineer,c_quality_engineer1,c_quality_engineer2,c_quality_engineer3,c_quality_engineer4,c_quality_engineer5,c_quality_engineer6,c_manufacture_engineer,doc_engineer,ipqc_hard_tag,c_quality_engineer7,doc_engineer2,project_creation_date,create_date,create_by)
(site,bu_no,project_no,ori_project_id,project_category,project_name,project_desc,status,project_source,customer_no,final_customer_id,priority,remark,need_date,c_project_region,project_manager,project_owner,engineer,c_quality_engineer1,c_quality_engineer2,c_quality_engineer3,c_quality_engineer4,c_quality_engineer5,c_quality_engineer6,c_manufacture_engineer,doc_engineer,ipqc_hard_tag,c_quality_engineer7,qc_engineer,pe_engineer,ee_engineer, doc_engineer2,project_creation_date,create_date,create_by)
VALUES
(#{site},#{buNo},#{projectNo},#{oriProjectId},#{projectCategory},#{projectName},#{projectDesc},#{status},#{projectSource},#{customerNo},#{finalCustomerId},#{priority},#{remark},#{needDate},#{cProjectRegion},#{projectManager},#{projectOwner},#{engineer},#{cQualityEngineer1},#{cQualityEngineer2},#{cQualityEngineer3},#{cQualityEngineer4},#{cQualityEngineer5},#{cQualityEngineer6},#{cManufactureEngineer},#{docEngineer},#{ipqcHardTag},#{cQualityEngineer7},#{docEngineer2},#{projectCreationDate},GetDATE(),#{createBy})
(#{site},#{buNo},#{projectNo},#{oriProjectId},#{projectCategory},#{projectName},#{projectDesc},#{status},#{projectSource},#{customerNo},#{finalCustomerId},#{priority},#{remark},#{needDate},#{cProjectRegion},#{projectManager},#{projectOwner},#{engineer},#{cQualityEngineer1},#{cQualityEngineer2},#{cQualityEngineer3},#{cQualityEngineer4},#{cQualityEngineer5},#{cQualityEngineer6},#{cManufactureEngineer},#{docEngineer},#{ipqcHardTag},#{cQualityEngineer7},#{qcEngineer},#{peEngineer},#{eeEngineer},#{ docEngineer2},#{projectCreationDate},GetDATE(),#{createBy})
</insert>
<insert id= "saveProductionValidationDocument" >
INSERT INTO plm_project_document_confirm_file_list
@ -31,7 +31,7 @@
#{cQualityEngineer2},c_quality_engineer3 = #{cQualityEngineer3},c_quality_engineer4 =
#{cQualityEngineer4},c_quality_engineer5 = #{cQualityEngineer5},c_quality_engineer6 =
#{cQualityEngineer6},c_manufacture_engineer = #{cManufactureEngineer},doc_engineer =
#{docEngineer},ipqc_hard_tag = #{ipqcHardTag},c_quality_engineer7 = #{cQualityEngineer7},update_date =
#{docEngineer},ipqc_hard_tag = #{ipqcHardTag},c_quality_engineer7 = #{cQualityEngineer7},qc_engineer = #{qcEngineer},pe_engineer = #{peEngineer},ee_engineer = #{eeEngineer}, update_date =
GETDATE(),update_by = #{updateBy},project_creation_date = #{projectCreationDate},doc_engineer2 = #{docEngineer2}
,project_close_date =
CASE
@ -99,7 +99,7 @@
SELECT
a.id as project_id,a.site,a.bu_no,d.bu_desc,a.project_no,a.project_category,a.project_name, a.project_desc,a.status, a.project_source, a.customer_no, a.final_customer_id, a.priority,a.engineer,
a.remark,a.need_date,a.c_project_region,a.project_manager,a.project_owner,a.c_project_build_date,a.c_quality_engineer1,a.c_quality_engineer2,a.c_quality_engineer3,a.c_quality_engineer4,a.c_quality_engineer5,a.c_quality_engineer6,
a.c_manufacture_engineer,a.doc_engineer,a.doc_engineer2,a.ipqc_hard_tag,A.c_quality_engineer7,a.project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,c.customer_desc, CKT_MES_II_REAL.dbo.plm_get_customer_desc(a.site,a.final_customer_id) as final_customer_name
a.c_manufacture_engineer,a.doc_engineer,a.doc_engineer2,a.ipqc_hard_tag,A.c_quality_engineer7,a.qc_engineer,a.pe_engineer,a.ee_engineer,a. project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,c.customer_desc, CKT_MES_II_REAL.dbo.plm_get_customer_desc(a.site,a.final_customer_id) as final_customer_name
FROM plm_project_info as a
LEFT JOIN plm_customer_information as c ON a.customer_no = c.customer_no and a.site = c.site
left join CKT_MES_II_REAL.dbo.BU as d on a.site = d.site and a.bu_no = d.bu_no
@ -165,7 +165,7 @@
SELECT
a.id as project_id,a.site,a.bu_no,d.bu_desc,a.project_no,a.project_category,a.project_name, a.project_desc,a.status, a.project_source, a.customer_no, a.final_customer_id, a.priority,a.engineer,
a.remark,a.need_date,a.c_project_region,a.project_manager,a.project_owner,a.c_project_build_date,a.c_quality_engineer1,a.c_quality_engineer2,a.c_quality_engineer3,a.c_quality_engineer4,a.c_quality_engineer5,a.c_quality_engineer6,
a.c_manufacture_engineer,a.doc_engineer,a.doc_engineer2,a.ipqc_hard_tag,a.c_quality_engineer7,a.project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,c.customer_desc, CKT_MES_II_REAL.dbo.plm_get_customer_desc(a.site,a.final_customer_id) as final_customer_name
a.c_manufacture_engineer,a.doc_engineer,a.doc_engineer2,a.ipqc_hard_tag,a.c_quality_engineer7,a.qc_engineer,a.pe_engineer,a.ee_engineer,a. project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,c.customer_desc, CKT_MES_II_REAL.dbo.plm_get_customer_desc(a.site,a.final_customer_id) as final_customer_name
FROM plm_project_info as a
LEFT JOIN plm_customer_information as c ON a.customer_no = c.customer_no and a.site = c.site
left join CKT_MES_II_REAL.dbo.BU as d on a.site = d.site and a.bu_no = d.bu_no
@ -182,7 +182,7 @@
SELECT
a.site,a.bu_no,a.id as project_id,a.project_category, a.project_name, a.project_desc,a.status, a.project_source, a.customer_no, a.priority,
a.remark,a.need_date,a.c_project_region,a.project_manager,a.project_owner,a.c_project_build_date,a.c_quality_engineer1,a.c_quality_engineer2,a.c_quality_engineer3,a.c_quality_engineer4,a.c_quality_engineer5,a.c_quality_engineer6,
a.c_manufacture_engineer,a.doc_engineer,a.doc_engineer2,a.ipqc_hard_tag,a.c_quality_engineer7,a.project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,b.test_part_no,b.part_desc
a.c_manufacture_engineer,a.doc_engineer,a.doc_engineer2,a.ipqc_hard_tag,a.c_quality_engineer7,a.qc_engineer,a.pe_engineer,a.ee_engineer,a. project_close_date,a.project_creation_date,a.create_date,a.create_by,a.update_date,a.update_by,b.test_part_no,b.part_desc
FROM plm_project_info as a
LEFT JOIN plm_project_part as b ON a.id = b.project_id
WHERE a.project_no = #{projectNo} and a.site = #{site} and a.bu_no = #{buNo}
@ -237,8 +237,6 @@
AND b.BU = a.bu_no
AND b.document_type = '产品文档'
<where >
a.site = #{query.site}
AND a.bu_no = #{query.buNo}
AND s.user_id IS NOT NULL
AND b.userid IS NULL
<if test= "query.username != null and query.username != ''" >
@ -439,6 +437,8 @@
LEFT JOIN plm_customer_information as c ON a.customer_no = c.customer_no and a.site = c.site
left join CKT_MES_II_REAL.dbo.BU as d on b.site = d.site and b.bu_no = d.bu_no
<where >
b.site in (select site from eam_access_site where username = #{query.userName})
and (b.site + '-' + b.bu_no) in (select * from dbo.query_bu(#{query.userName}))
<if test= "query.projectId != null and query.projectId != ''" >
AND (
a.project_id = #{query.projectId}
@ -659,6 +659,9 @@
engineer,
ipqc_hard_tag,
c_quality_engineer7,
qc_engineer,
pe_engineer,
ee_engineer,
status,
part_type,
priority,
@ -689,6 +692,9 @@
#{engineer},
#{ipqcHardTag},
#{cQualityEngineer7},
#{qcEngineer},
#{peEngineer},
#{eeEngineer},
#{status},
#{partType},
#{priority},
@ -709,7 +715,7 @@
SET test_part_no = #{testPartNo},part_desc = #{partDesc},update_date = GETDATE(),update_by = #{updateBy},
build_date = #{buildDate}, priority = #{priority}, project_category = #{projectCategory}, need_date =
#{needDate}, project_manager = #{projectManager}, project_owner = #{projectOwner}, engineer = #{engineer}, c_quality_engineer1 = #{cQualityEngineer1}, c_quality_engineer2 = #{cQualityEngineer2}, c_quality_engineer3 = #{cQualityEngineer3}, c_quality_engineer4 = #{cQualityEngineer4}, c_quality_engineer5 = #{cQualityEngineer5}, c_quality_engineer6 = #{cQualityEngineer6}, c_manufacture_engineer = #{cManufactureEngineer},doc_engineer = #{docEngineer},doc_engineer2 = #{docEngineer2},ipqc_hard_tag = #{ipqcHardTag},
c_quality_engineer7 = #{cQualityEngineer7},remark = #{remark},
c_quality_engineer7 = #{cQualityEngineer7},qc_engineer = #{qcEngineer},pe_engineer = #{peEngineer},ee_engineer = #{eeEngineer}, remark = #{remark},
status = CASE WHEN #{status} IS NOT NULL THEN #{status} ELSE status END,customer_no = #{customerNo},
part_type = CASE WHEN #{partType} IS NOT NULL THEN #{partType} ELSE part_type END,
close_date = (CASE
