wilson
/
ccl-plm-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-10-16

master
qiezi 2 years ago
parent
00414c61cc
commit
af8c3efff1
5 changed files with 365 additions and 194 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 211
      src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
  2. 6
      src/main/resources/mapper/proofing/ProofingInformationMapper.xml
  3. 2
      src/main/resources/mapper/quotation/QuotationInformationMapper.xml
  4. 75
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
  5. 3
      src/main/resources/mapper/test/TestInformationMapper.xml

211
src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
View File

@ -2,13 +2,36 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.spring.modules.Tooling.mapper.ProjectToolingApplyMapper"> <mapper namespace="com.spring.modules.Tooling.mapper.ProjectToolingApplyMapper">
<select id="projectInfoForToolApply" parameterType="PlmProjectInfoData" resultType="PlmProjectInfoData"> <select id="projectInfoForToolApply" parameterType="PlmProjectInfoData" resultType="PlmProjectInfoData">
SELECT project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by,
create_date,update_by,update_date,priority,site,id,project_desc,customer_remark,remark,dbo.get_projectTeamName(site,project_id,'owner') projectOwnerName
,dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,
final_customer_id,dbo.plm_get_customer_desc(site,final_customer_id) finalCustomerName
SELECT project_id,
ori_project_id,
project_type_db,
project_name,
status,
project_source,
customer_id,
create_by,
create_date,
update_by,
update_date,
priority,
site,
id,
project_desc,
customer_remark,
remark,
dbo.get_projectTeamName(site, project_id, 'owner') projectOwnerName
,
dbo.get_projectTeamName(site, project_id, 'manager') ProjectManagerName,
dbo.plm_get_dictDataLabel('project_info_type_db', project_type_db, site) projectType,
dbo.plm_get_projectBaseDesc(status, 'project_status') projectStatusDesc,
dbo.plm_get_dictDataLabel('project_info_source', project_source, site) projectSourceDesc,
dbo.plm_get_customer_desc(site, customer_id) customerName,
dbo.plm_get_dictDataLabel('project_info_priority', priority, site) priorityDesc,
need_date,
dbo.get_projectUserRoleName(site, project_id) userRoleName,
parent_project_no,
final_customer_id,
dbo.plm_get_customer_desc(site, final_customer_id) finalCustomerName
FROM plm_project_info FROM plm_project_info
<where> <where>
<!-- and dbo.plm_get_projectBaseDesc(status,'project_status') !='未发布'--> <!-- and dbo.plm_get_projectBaseDesc(status,'project_status') !='未发布'-->
@ -38,53 +61,105 @@
</select> </select>
<select id="getProjectPartToolForApply" resultType="RoutingToolApplyData"> <select id="getProjectPartToolForApply" resultType="RoutingToolApplyData">
SELECT b.site,b.project_id,d.part_no,b.part_desc,c.routing_revision,c.routing_type,c.alternative_no,c.operation_no,c.operation_name,
d.operation_id,d.tool_id,d.tool_qty,d.remark,e.tool_description,e.standard_cost
,dbo.plm_get_alternativeDesc(c.site,c.part_no,c.routing_revision,c.routing_type,c.alternative_no) alternativeDescription
SELECT b.site,
b.project_id,
d.part_no,
b.part_desc,
c.routing_revision,
c.routing_type,
c.alternative_no,
c.operation_no,
c.operation_name,
d.operation_id,
d.tool_id,
d.tool_qty,
d.remark,
e.tool_description,
e.standard_cost
,
dbo.plm_get_alternativeDesc(c.site, c.part_no, c.routing_revision, c.routing_type,
c.alternative_no) alternativeDescription
FROM view_Project_Part b FROM view_Project_Part b
left join plm_routing_component c on b.site = c.site and b.test_part_no = c.part_no left join plm_routing_component c on b.site = c.site and b.test_part_no = c.part_no
left join routing_tool d on c.site=d.site and c.part_no=d.part_no and c.routing_revision=d.routing_revision and c.routing_type=d.routing_type
left join routing_tool d
on c.site = d.site and c.part_no = d.part_no and c.routing_revision = d.routing_revision and
c.routing_type = d.routing_type
and c.operation_id = d.operation_id and c.operation_id = d.operation_id
left join tool_header e on d.site = e.site and d.tool_id = e.tool_id left join tool_header e on d.site = e.site and d.tool_id = e.tool_id
where b.site=#{site} and b.project_id in ${projectId} and d.tool_id is not null and b.active='Y'
where b.site = #{site}
and b.project_id in ${projectId}
and d.tool_id is not null
and b.active = 'Y'
order by b.project_id, d.part_no, c.routing_revision, c.routing_type, c.alternative_no, c.operation_no order by b.project_id, d.part_no, c.routing_revision, c.routing_type, c.alternative_no, c.operation_no
</select> </select>
<insert id="saveApplyHeader"> <insert id="saveApplyHeader">
INSERT INTO plm_project_tool_applyHeader (site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,
INSERT INTO plm_project_tool_applyHeader (site, apply_no, apply_by, status_code, status, apply_date,
applySumQty, applyReason, remark,
create_by, create_date, department, quoter, tp, purchaser, totalCost) create_by, create_date, department, quoter, tp, purchaser, totalCost)
values
(#{site},#{applyNo},#{applyBy},#{statusCode},#{status},#{applyDate},#{applySumQty},#{applyReason},#{remark},#{createBy},
values (#{site}, #{applyNo}, #{applyBy}, #{statusCode}, #{status}, #{applyDate}, #{applySumQty}, #{applyReason},
#{remark}, #{createBy},
#{createDate}, #{department}, #{quoter}, #{tp}, #{purchaser}, #{totalCost}) #{createDate}, #{department}, #{quoter}, #{tp}, #{purchaser}, #{totalCost})
</insert> </insert>
<insert id="saveApplyDetail"> <insert id="saveApplyDetail">
INSERT INTO plm_project_tool_applyDetail (site,apply_no,seqNo,tool_id,standard_cost,applyQty,remark,orderRef1,orderRef2,orderRef3,orderRef4,orderRef5,orderRef6) values
INSERT INTO plm_project_tool_applyDetail (site, apply_no, seqNo, tool_id, standard_cost, applyQty, remark,
orderRef1, orderRef2, orderRef3, orderRef4, orderRef5,
orderRef6) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
(#{item.site},#{item.applyNo},#{item.seqNo},#{item.toolId},#{item.standardCost},#{item.applyQty},#{item.remark},#{item.orderRef1},
(#{item.site}, #{item.applyNo}, #{item.seqNo}, #{item.toolId}, #{item.standardCost}, #{item.applyQty},
#{item.remark}, #{item.orderRef1},
#{item.orderRef2}, #{item.orderRef3}, #{item.orderRef4}, #{item.orderRef5}, #{item.orderRef6}) #{item.orderRef2}, #{item.orderRef3}, #{item.orderRef4}, #{item.orderRef5}, #{item.orderRef6})
</foreach> </foreach>
</insert> </insert>
<update id="updateRoutingToolRequireFlag"> <update id="updateRoutingToolRequireFlag">
update routing_tool set ApplyFlag='Y' from plm_project_tool_applyDetail b
where b.site=#{site} and b.apply_no=#{newApplyNo}
and routing_tool.site=b.Site and routing_tool.part_no=b.orderRef2 and CONVERT(varchar(20),routing_tool.routing_revision) =b.orderRef3 and
routing_tool.routing_type=b.orderRef4 and routing_tool.alternative_no=b.orderRef5
update routing_tool
set ApplyFlag='Y'
from plm_project_tool_applyDetail b
where b.site = #{site}
and b.apply_no = #{newApplyNo}
and routing_tool.site = b.Site
and routing_tool.part_no = b.orderRef2
and CONVERT(varchar(20), routing_tool.routing_revision) = b.orderRef3
and routing_tool.routing_type = b.orderRef4
and routing_tool.alternative_no = b.orderRef5
and CONVERT(varchar(20), routing_tool.operation_id) = b.orderRef6 and CONVERT(varchar(20), routing_tool.operation_id) = b.orderRef6
</update> </update>
<select id="searchToolApplyHeader" resultType="PlmProjectToolApplyHeaderData"> <select id="searchToolApplyHeader" resultType="PlmProjectToolApplyHeaderData">
SELECT site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,create_by,create_date,update_by,
update_date,prNo,remark1,poNo,allCost,remark2,supplierName,department,dbo.plm_get_dictDataLabel('tool_application_department',department,site) departmentDesc
,tp,dbo.get_userDisPlay(tp) tpName ,quoter,dbo.get_userDisPlay(quoter) quoterName ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName,step_id
,reject_flag ,reject_step_id,totalCost
SELECT site
, apply_no
, apply_by
, status_code
, status
, apply_date
, applySumQty
, applyReason
, remark
, create_by
, create_date
, update_by
, update_date
, prNo
, remark1
, poNo
, allCost
, remark2
, supplierName
, department
, dbo.plm_get_dictDataLabel('tool_application_department', department, site) departmentDesc
, tp
, dbo.get_userDisPlay(tp) tpName
, quoter
, dbo.get_userDisPlay(quoter) quoterName
, purchaser
, dbo.get_userDisPlay(purchaser) purchaserName
, step_id
, reject_flag
, reject_step_id
, totalCost
FROM plm_project_tool_applyHeader FROM plm_project_tool_applyHeader
<where> <where>
<if test="query.site != null and query.site != ''"> <if test="query.site != null and query.site != ''">
AND site = #{query.site} AND site = #{query.site}
</if> </if>
@ -109,9 +184,25 @@
</select> </select>
<select id="searchToolApplyDetail" resultType="PlmProjectToolApplyDetailData"> <select id="searchToolApplyDetail" resultType="PlmProjectToolApplyDetailData">
select a.site,a.apply_no,a.seqNo,a.tool_id,a.standard_cost,a.applyQty,a.remark,a.orderRef1,a.orderRef2,a.orderRef3,a.orderRef4,
a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operation_no,b.operation_name
from plm_project_tool_applyDetail a left join plm_routing_component b on a.site=b.site and a.orderRef6=convert(varchar(20),b.operation_id)
select a.site,
a.apply_no,
a.seqNo,
a.tool_id,
a.standard_cost,
a.applyQty,
a.remark,
a.orderRef1,
a.orderRef2,
a.orderRef3,
a.orderRef4,
a.orderRef5,
dbo.plm_get_toolDesc(a.site, a.tool_id) toolDesc,
a.orderRef6,
b.operation_no,
b.operation_name
from plm_project_tool_applyDetail a
left join plm_routing_component b
on a.site = b.site and a.orderRef6 = convert(varchar(20), b.operation_id)
<where> <where>
<if test="site != null and site != ''"> <if test="site != null and site != ''">
AND a.site = #{site} AND a.site = #{site}
@ -127,8 +218,7 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
</select> </select>
<select id="checkToolApplyHeaderData" resultType="PlmProjectToolApplyHeaderData"> <select id="checkToolApplyHeaderData" resultType="PlmProjectToolApplyHeaderData">
select
site,
select site,
apply_no, apply_no,
apply_by, apply_by,
status_code, status_code,
@ -150,27 +240,48 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
step_id, step_id,
reject_flag, reject_flag,
reject_step_id reject_step_id
,tp,dbo.get_userDisPlay(tp) tpName ,quoter,dbo.get_userDisPlay(quoter) quoterName ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName
,
tp,
dbo.get_userDisPlay(tp) tpName,
quoter,
dbo.get_userDisPlay(quoter) quoterName,
purchaser,
dbo.get_userDisPlay(purchaser) purchaserName
FROM plm_project_tool_applyHeader FROM plm_project_tool_applyHeader
where site = #{site} and apply_no = #{applyNo}
where site = #{site}
and apply_no = #{applyNo}
</select> </select>
<update id="comfirmToolApply"> <update id="comfirmToolApply">
update plm_project_tool_applyHeader update plm_project_tool_applyHeader
set status_code = #{statusCode}, set status_code = #{statusCode},
status = #{status} status = #{status}
where site = #{site} and apply_no = #{applyNo}
where site = #{site}
and apply_no = #{applyNo}
</update> </update>
<delete id="deletetoolingApplyHeader"> <delete id="deletetoolingApplyHeader">
delete from plm_project_tool_applyHeader where site=#{site} and apply_no=#{applyNo}
delete
from plm_project_tool_applyHeader
where site = #{site}
and apply_no = #{applyNo}
</delete> </delete>
<delete id="deletetoolingApplyDetail"> <delete id="deletetoolingApplyDetail">
delete from plm_project_tool_applyDetail where site=#{site} and apply_no=#{applyNo}
delete
from plm_project_tool_applyDetail
where site = #{site}
and apply_no = #{applyNo}
</delete> </delete>
<update id="saveHeaderMessage"> <update id="saveHeaderMessage">
update plm_project_tool_applyHeader set prNo=#{prNo},remark1=#{remark1},poNo=#{poNo},
allCost=#{allCost},remark2=#{remark2},supplierName=#{supplierName} where site=#{site} and apply_no=#{applyNo}
update plm_project_tool_applyHeader
set prNo=#{prNo},
remark1=#{remark1},
poNo=#{poNo},
allCost=#{allCost},
remark2=#{remark2},
supplierName=#{supplierName}
where site = #{site}
and apply_no = #{applyNo}
</update> </update>
<update id="updateApplyHeader"> <update id="updateApplyHeader">
@ -182,16 +293,21 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
quoter=#{quoter}, quoter=#{quoter},
purchaser=#{purchaser}, purchaser=#{purchaser},
totalCost=#{totalCost,jdbcType=DECIMAL} totalCost=#{totalCost,jdbcType=DECIMAL}
where site = #{site} and apply_no = #{applyNo}
where site = #{site}
and apply_no = #{applyNo}
</update> </update>
<update id="updateApplyDetail"> <update id="updateApplyDetail">
update plm_project_tool_applyDetail set applyQty=#{applyQty},standard_cost=#{standardCost} where site=#{site} and apply_no=#{applyNo} and seqNo=#{seqNo}
update plm_project_tool_applyDetail
set applyQty=#{applyQty},
standard_cost=#{standardCost}
where site = #{site}
and apply_no = #{applyNo}
and seqNo = #{seqNo}
</update> </update>
<select id="getProjectPartToolDetail" resultType="PlmProjectToolApplyDetailData"> <select id="getProjectPartToolDetail" resultType="PlmProjectToolApplyDetailData">
select
site,
select site,
apply_no, apply_no,
seqNo, seqNo,
tool_id, tool_id,
@ -206,6 +322,7 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
unit_cost, unit_cost,
orderRef6 orderRef6
FROM plm_project_tool_applyDetail FROM plm_project_tool_applyDetail
where site = #{site} and apply_no = #{applyNo}
where site = #{site}
and apply_no = #{applyNo}
</select> </select>
</mapper> </mapper>

6
src/main/resources/mapper/proofing/ProofingInformationMapper.xml
View File

@ -61,8 +61,10 @@
on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
left join BU b on vpp.bu_no = b.bu_no and a.site = b.site left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
<where> <where>
a.site = #{query.site} and
vpp.bu_no in ( select bu_No from dbo.Get_Now_BU_chooseAble (a.site,#{query.createBy}))
a.site = #{query.site}
<if test="query.createBy != null and query.createBy != ''">
and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
</if>
<if test="query.customerNo != null and query.customerNo != ''"> <if test="query.customerNo != null and query.customerNo != ''">
AND customer_no like #{query.customerNo} AND customer_no like #{query.customerNo}
</if> </if>

2
src/main/resources/mapper/quotation/QuotationInformationMapper.xml
View File

@ -122,7 +122,9 @@
left join BU b on vpp.bu_no = b.bu_no and a.site = b.site left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
<where> <where>
a.site = #{query.site} a.site = #{query.site}
<if test="query.createBy != null and query.createBy != ''">
and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy})) and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
</if>
<if test="query.quotationNo != null and query.quotationNo != ''"> <if test="query.quotationNo != null and query.quotationNo != ''">
AND a.quotation_no = #{query.quotationNo} AND a.quotation_no = #{query.quotationNo}
</if> </if>

75
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
View File

@ -3,23 +3,70 @@
<mapper namespace="com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper"> <mapper namespace="com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper">
<select id="technicalSpecificationListSearch" parameterType="PlmTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData"> <select id="technicalSpecificationListSearch" parameterType="PlmTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData">
SELECT a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,a.ori_code_no,
a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,b.part_type partTypeDesc,
b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,b.bu_no,dbo.plm_get_bu_desc(a.site,b.bu_no) buDesc,
SELECT a.id,
a.site,
a.code_no,
a.project_id,
a.test_part_no,
a.status,
a.rev_no,
a.work_center_no,
a.ECN_flag,
a.ECN_no,
a.ori_code_no,
a.ECN_address,
a.remark,
a.create_date,
a.create_by,
a.update_date,
a.update_by,
b.final_part_no,
b.part_type partTypeDesc,
b.part_type,
b.part_name,
b.part_desc,
b.part_spec,
dbo.plm_get_technicalBaseDesc(a.status, 'status') statusDesc,
a.proofing_no,
b.bu_no,
dbo.plm_get_bu_desc(a.site, b.bu_no) buDesc,
dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'engineer') engineer, dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'engineer') engineer,
dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician,process,
dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id
,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,a.bom_type,a.eng_chg_level,a.bom_alternative_no,a.routing_type,a.routing_revision,
a.routing_alternative_no,a.pod,
a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName
, a.cqcOperator,dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName
, a.faiOperator,dbo.get_userDisPlay(a.faiOperator) faiOperatorName
,a.peOperater,dbo.get_userDisPlay(a.peOperater) peOperaterName
,a.csOperater,dbo.get_userDisPlay(a.csOperater) csOperaterName
,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName
dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'technician') technician,
process,
dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'quotationOfficer') quotationOfficer,
c.customer_Id
,
a.picture_addess,
a.customerPictureChangeRemark,
a.productionFileComments,
a.bom_type,
a.eng_chg_level,
a.bom_alternative_no,
a.routing_type,
a.routing_revision,
a.routing_alternative_no,
a.pod,
a.mpOperator,
dbo.get_userDisPlay(a.mpOperator) mpOperatorName
,
a.cqcOperator,
dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName
,
a.faiOperator,
dbo.get_userDisPlay(a.faiOperator) faiOperatorName
,
a.peOperater,
dbo.get_userDisPlay(a.peOperater) peOperaterName
,
a.csOperater,
dbo.get_userDisPlay(a.csOperater) csOperaterName
,
a.dccOperater,
dbo.get_userDisPlay(a.dccOperater) dccOperaterName
FROM plm_technical_specification_sheet a FROM plm_technical_specification_sheet a
left join view_Project_final_Part b on a.site=b.site and a.project_id=b.project_id and a.test_part_no=b.test_part_no
left join view_Project_final_Part b
on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
left join plm_project_info c on a.site = c.site and a.project_id = c.project_id left join plm_project_info c on a.site = c.site and a.project_id = c.project_id
<where> <where>
<if test="query.id != null"> <if test="query.id != null">

3
src/main/resources/mapper/test/TestInformationMapper.xml
View File

@ -66,7 +66,10 @@
left join BU b on vpp.bu_no = b.bu_no and a.site = b.site left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
<where> <where>
a.site = #{query.site} a.site = #{query.site}
<if test="query.createBy != null and query.createBy != ''">
and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy})) and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
</if>
<if test="query.testNo != null and query.testNo != ''"> <if test="query.testNo != null and query.testNo != ''">
AND a.test_no like #{query.testNo} AND a.test_no like #{query.testNo}
</if> </if>

Write Preview
Loading…
Cancel
Save