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

2025-06-23 

技术参数卡 控制只读未生效
master
fengyuan_yang 9 months ago
parent
3597baa4e6
commit
3d049c68ef
3 changed files with 48 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  2. 4
      src/main/resources/mapper/project/ProjectDao.xml
  3. 92
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

4
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
View File

@ -464,12 +464,12 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
// customerPartNo
// 判断是否存在CustomerPartNo
String customerPartNo = technicalSpecificationMapper.queryCustomerPartNo(data.getSite(),data.getPartNo(),data.getCustomerId());
if (StringUtils.isEmpty(customerPartNo)){
if (StringUtils.isEmpty(customerPartNo)) {
// 不存在数据 新增
if (StringUtils.hasText(data.getCustomerPartNo())){
technicalSpecificationMapper.saveCustomerPartNo(data.getSite(),data.getPartNo(),data.getCustomerId(),data.getCustomerPartNo(),sysUserEntity.getUsername());
}
}else {
} else {
//存在数据修改
technicalSpecificationMapper.updateCustomerPartNo(data.getSite(),data.getPartNo(),data.getCustomerId(),data.getCustomerPartNo(),sysUserEntity.getUsername());
}

4
src/main/resources/mapper/project/ProjectDao.xml
View File

@ -766,7 +766,9 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
</select>
<update id="updateProjectFinalCustomerNo">
update plm_project_info set final_customer_id = #{finalCustomerId} where site = #{site} and project_id = #{projectId}
update plm_project_info
set final_customer_id = #{finalCustomerId}
where site = #{site} and project_id = #{projectId}
</update>
<select id="queryProjectSiteUserRole" resultType="com.spring.modules.sys.entity.SysUserEntity">

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

@ -398,11 +398,10 @@
</delete>
<update id="updateBMProcess">
update plm_technical_specification_sheet
set process=#{process},
overPrintOperator=#{overPrintOperator},
printOperator=#{printOperator}
where site = #{site}
and code_no = #{codeNo}
set process = #{process},
overPrintOperator = #{overPrintOperator},
printOperator = #{printOperator}
where site = #{site} and code_no = #{codeNo}
</update>
<select id="getTestPartChangeData" resultType="PlmProjectPartData">
@ -512,38 +511,36 @@
</update>
<select id="searchBMcustomerInfo" resultType="PlmTechnicalSpecificationSheetData">
select a.site,
a.code_no,
a.picture_addess,
a.customerPictureChangeRemark,
a.productionFileComments,
b.customer_id,
dbo.plm_get_customer_desc(b.site, b.customer_id) CustomerDesc,
b.final_customer_id finalCustomerNo,
dbo.plm_get_dictDataLabel('finalCustomer', b.final_customer_id, a.site) finalCustomerDesc,
c.final_part_no as part_no,
c.part_desc,
c.material_number,
c.part_type as part_family,
b.customer_remark,
a.remark,
a.ori_code_no,
a.materialType,
a.customerRevNo,
a.materialNumber,
a.certification,
a.customerRemark,
a.projectRemark,
b.project_id,
pcpi.customer_part_no
select
a.site,
a.code_no,
a.picture_addess,
a.customerPictureChangeRemark,
a.productionFileComments,
b.customer_id,
dbo.plm_get_customer_desc(b.site, b.customer_id) CustomerDesc,
b.final_customer_id finalCustomerNo,
dbo.plm_get_dictDataLabel('finalCustomer', b.final_customer_id, a.site) finalCustomerDesc,
c.final_part_no as part_no,
c.part_desc,
c.material_number,
c.part_type as part_family,
b.customer_remark,
a.remark,
a.ori_code_no,
a.materialType,
a.customerRevNo,
a.materialNumber,
a.certification,
a.customerRemark,
a.projectRemark,
b.project_id,
pcpi.customer_part_no
from plm_technical_specification_sheet a
left join plm_project_info b on a.site = b.site and a.project_id = b.project_id
left join view_Project_final_Part c
on a.site = c.site and a.test_part_no = c.test_part_no and a.project_id = c.project_id
left join plm_customer_part_info pcpi
on a.site = pcpi.site and a.test_part_no = pcpi.part_no and b.customer_id = pcpi.customer_no
where a.site = #{site}
and a.code_no = #{codeNo}
left join plm_project_info b on a.site = b.site and a.project_id = b.project_id
left join view_Project_final_Part c on a.site = c.site and a.test_part_no = c.test_part_no and a.project_id = c.project_id
left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and b.customer_id = pcpi.customer_no
where a.site = #{site} and a.code_no = #{codeNo}
</select>
<update id="updateBMcustomerInfo">
@ -2392,18 +2389,18 @@
</select>
<insert id="saveCustomerPartNo">
insert into plm_customer_part_info(site, customer_no, part_no, customer_part_no, create_date, create_by)
values (#{site}, #{customerId}, #{partNo}, #{customerPartNo}, getdate(), #{username})
insert into plm_customer_part_info
(site, customer_no, part_no, customer_part_no, create_date, create_by)
values
(#{site}, #{customerId}, #{partNo}, #{customerPartNo}, getdate(), #{username})
</insert>
<update id="updateCustomerPartNo">
update plm_customer_part_info
set customer_part_no = #{customerPartNo},
update_by = #{username},
update_date = getdate()
where site = #{site}
and customer_no = #{customerId}
and part_no = #{partNo}
update_by = #{username},
update_date = getdate()
where site = #{site} and customer_no = #{customerId} and part_no = #{partNo}
</update>
<select id="technicalSpecificationList" resultType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
@ -2730,8 +2727,7 @@
set is_remark = 1
where site = #{site} and document_no = #{codeNo} and document_type = 'BM' and is_remark = 0
</update>
<update id="updateBMProcessInfo"
parameterType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
<update id="updateBMProcessInfo" parameterType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
UPDATE plm_technical_specification_sheet
SET simplex_duplex = #{simplexDuplex},
repeat = #{repeat},
@ -2749,12 +2745,10 @@
slitting_tolerance = #{slittingTolerance},
label_length = #{labelLength},
label_width = #{labelWidth}
where site = #{site}
and code_no = #{codeNo}
where site = #{site} and code_no = #{codeNo}
</update>
<select id="nodeList" resultType="com.spring.modules.sampleManagement.entity.NodeVo"
parameterType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
<select id="nodeList" resultType="com.spring.modules.sampleManagement.entity.NodeVo" parameterType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
SELECT
d.node_id AS nodeId,
d.node_name AS nodeName

Write Preview
Loading…
Cancel
Save