Browse Source

1127

master
ruanqi 1 year ago
parent
commit
2dfe69af1a
  1. 8
      src/main/java/com/spring/modules/project/controller/ProjectController.java
  2. 3
      src/main/java/com/spring/modules/project/dao/ProjectDao.java
  3. 8
      src/main/java/com/spring/modules/project/data/PlmProjectPartData.java
  4. 1
      src/main/java/com/spring/modules/project/service/ProjectService.java
  5. 6
      src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
  6. 13
      src/main/resources/mapper/project/ProjectDao.xml

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

@ -9,6 +9,7 @@ import com.spring.modules.factory.entity.vo.SiteVo;
import com.spring.modules.factory.service.SiteService;
import com.spring.modules.project.data.*;
import com.spring.modules.project.entity.PlmProjectInfo;
import com.spring.modules.project.entity.PlmProjectPart;
import com.spring.modules.project.service.ProjectService;
import com.spring.modules.sampleManagement.entity.BiAddress;
import org.springframework.beans.factory.annotation.Autowired;
@ -306,4 +307,11 @@ public class ProjectController {
List<PlmProjectInfoData> list = projectService.queryProject(project);
return R.ok().put("rows", list);
}
@PostMapping(value="/getProjectPartNowBm")
@ResponseBody
public R getProjectPartNowBm(@RequestBody PlmProjectPart part){
List<PlmProjectPartData> list = projectService.getProjectPartNewBm(part);
return R.ok().put("rows", list);
}
}

3
src/main/java/com/spring/modules/project/dao/ProjectDao.java

@ -240,4 +240,7 @@ public interface ProjectDao extends BaseMapper<PlmProjectInfo> {
List<PlmProjectInfoData> queryProject(PlmProjectInfo project);
List<PlmProjectPart> queryProjectPart(PlmProjectPart part);
List<PlmProjectPartData> getProjectPartNewBm(PlmProjectPart part);
}

8
src/main/java/com/spring/modules/project/data/PlmProjectPartData.java

@ -47,6 +47,7 @@ public class PlmProjectPartData extends PlmProjectPart {
private String statusDesc;
private String plmPartNo;
private String nowBm;
public String getPlmPartNo() {
return plmPartNo;
@ -176,4 +177,11 @@ public class PlmProjectPartData extends PlmProjectPart {
this.type = type;
}
public String getNowBm() {
return nowBm;
}
public void setNowBm(String nowBm) {
this.nowBm = nowBm;
}
}

1
src/main/java/com/spring/modules/project/service/ProjectService.java

@ -208,4 +208,5 @@ public interface ProjectService {
List<PlmProjectInfoData> queryProject(PlmProjectInfo project);
List<PlmProjectPart> queryProjectPart(PlmProjectPart part);
List<PlmProjectPartData> getProjectPartNewBm(PlmProjectPart part);
}

6
src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

@ -320,4 +320,10 @@ public class ProjectServiceImpl implements ProjectService {
public List<PlmProjectPart> queryProjectPart(PlmProjectPart part) {
return projectDao.queryProjectPart(part);
}
@Override
public List<PlmProjectPartData> getProjectPartNewBm(PlmProjectPart part) {
return projectDao.getProjectPartNewBm(part);
}
}

13
src/main/resources/mapper/project/ProjectDao.xml

@ -533,4 +533,17 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_
view_Project_Part
where site = #{site} and project_id = #{projectId} and test_part_no = #{testPartNo}
</select>
<select id="getProjectPartNewBm" resultType="PlmProjectPartData">
select
site,
project_id,
test_part_no,
part_desc,
now_bm,
final_part_no
from
plm_project_part
where site = #{site} and (test_part_no = #{testPartNo} or final_part_no= #{testPartNo}) and now_bm is not null
</select>
</mapper>
Loading…
Cancel
Save