Browse Source

2026-09-11

技术参数卡要向oa传site和BU
master
fengyuan_yang 1 week ago
parent
commit
35e2175617
  1. 2
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  2. 13
      src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java
  3. 27
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  4. 10
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

2
src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@ -1149,6 +1149,8 @@ public interface TechnicalSpecificationMapper {
PlmTechnicalSpecificationSheet selectTechnicalSpecification(@Param("site") String site, @Param("codeNo") String codeNo);
String getTechnicalSpecificationBuNo(@Param("site") String site, @Param("codeNo") String codeNo);
int lockIssueStatus(@Param("site") String site,
@Param("codeNo") String codeNo,
@Param("fromStatus") String fromStatus,

13
src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java

@ -148,6 +148,11 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
private String urlFile;
/**
* BU出口配置用表字段OA mainData 按项目物料关联 bu_no 取值不读本列
*/
private String buNo;
public String getUrlFile() {
return urlFile;
}
@ -156,6 +161,14 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
this.urlFile = urlFile;
}
public String getBuNo() {
return buNo;
}
public void setBuNo(String buNo) {
this.buNo = buNo;
}
public String getPlanOperator() {
return planOperator;
}

27
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -1650,7 +1650,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
// 获取指定属性值
// 主信息字段
if ("plm_technical_specification_sheet".equals(nodeDetail.getPlmTable())) {
fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
fieldValue = getTechnicalSpecificationSheetFieldValue(changeRequest, nodeDetail.getPlmField());
// 判断是否有值
if (StringUtils.hasText(fieldValue)) {
// 判断是否为人员
@ -1998,7 +1998,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
// 获取指定属性值
// 主信息字段
if ("plm_technical_specification_sheet".equals(nodeDetail.getPlmTable())) {
fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
fieldValue = getTechnicalSpecificationSheetFieldValue(changeRequest, nodeDetail.getPlmField());
// 判断是否有值
if (StringUtils.hasText(fieldValue)) {
// 判断是否为人员
@ -2088,6 +2088,29 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
return mainData;
}
/**
* 出口配置里的 BU 不读 plm_technical_specification_sheet.bu_no
* 与技术参数卡列表 technicalSpecificationList 相同取关联项目物料 bu_no
*/
private String getTechnicalSpecificationSheetFieldValue(PlmTechnicalSpecificationSheet sheet, String plmField) {
if (sheet == null || !StringUtils.hasText(plmField)) {
return "";
}
if ("bu".equals(plmField) || "buNo".equals(plmField) || "bu_no".equals(plmField)) {
return resolveTechnicalSpecificationBuNo(sheet);
}
Object value = getPropertyValue(sheet, plmField);
return value == null ? "" : (String) value;
}
private String resolveTechnicalSpecificationBuNo(PlmTechnicalSpecificationSheet sheet) {
if (sheet == null || !StringUtils.hasText(sheet.getSite()) || !StringUtils.hasText(sheet.getCodeNo())) {
return "";
}
String buNo = technicalSpecificationMapper.getTechnicalSpecificationBuNo(sheet.getSite(), sheet.getCodeNo());
return buNo == null ? "" : buNo;
}
@Override
public List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data) {
return technicalSpecificationMapper.queryChangeLog(data);

10
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@ -2317,6 +2317,16 @@
and a.code_no = #{codeNo}
</select>
<select id="getTechnicalSpecificationBuNo" resultType="java.lang.String">
select top 1 b.bu_no
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
where a.site = #{site}
and a.code_no = #{codeNo}
and b.bu_no is not null
and b.bu_no &lt;&gt; ''
</select>
<update id="updateStatus" parameterType="PlmTechnicalSpecificationSheetData">
update plm_technical_specification_sheet
set status = #{status},

Loading…
Cancel
Save