Browse Source

1127

master
ruanqi 2 years ago
parent
commit
40e1ba6124
  1. 1
      src/main/java/com/spring/modules/project/controller/ProjectController.java
  2. 2
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

1
src/main/java/com/spring/modules/project/controller/ProjectController.java

@ -298,4 +298,5 @@ public class ProjectController {
PageUtils rows = projectService.projectInfoPartSearch(data); PageUtils rows = projectService.projectInfoPartSearch(data);
return R.ok().put("page", rows); return R.ok().put("page", rows);
} }
} }

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

@ -76,7 +76,7 @@
</select> </select>
<select id="tsdBasicInformationSearch" resultType="PlmTechnicalSpecificationSheetData"> <select id="tsdBasicInformationSearch" resultType="PlmTechnicalSpecificationSheetData">
SELECT top 1 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,
SELECT top 1 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,c.bu_no,
a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,dbo.plm_get_projectBaseDesc(b.part_type,'part_type') partTypeDesc, a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,dbo.plm_get_projectBaseDesc(b.part_type,'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.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,
dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,stage,process,remarkPage, dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,stage,process,remarkPage,

Loading…
Cancel
Save