diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java index 88f10dab..304097cc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java @@ -42,4 +42,6 @@ public class DsProcessProjectVO extends DsProcessProjectEntity { @Serial private static final long serialVersionUID = 1L; + private String processNo; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java index f978c354..895b7315 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java @@ -77,4 +77,6 @@ public interface DsProcessMapper extends BaseMapper { List selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId); List selectDsProcessByCraftIdList(@Param("craftIds") List craftIds); + + List selectDsProcessByCraftIdAndProcessNo(@Param("craftId")Long craftId, @Param("processNo")String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java index 9d2fbee6..52b5b992 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java @@ -77,4 +77,6 @@ public interface DsProcessProjectMapper extends BaseMapper selectDsProcessProjectByProcessId(@Param("processId")Long processId); List selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId); + + List selectProjectByProcessIds(@Param("processIds") List processIdList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java index eb64af32..669b2b0f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java @@ -68,4 +68,9 @@ public interface PrReworkProcessMapper extends BaseMapper @Param("partCode") String partCode, @Param("batchNo") String batchNo, @Param("reworkNo") String reworkNo); + + List selectPrReworkProcessByProcessNo(@Param("reworkOrder")String reworkOrder, + @Param("partCode") String partCode, + @Param("batchNo") String batchNo, + @Param("processNo") String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml index 0d1134d1..af749cd7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml @@ -60,6 +60,16 @@ #{craftId} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml index aea93a4b..315dbefb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml @@ -53,6 +53,16 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity"> select * from P_RB_SYNC_PROCESS_PROJECT where PROCESS_ID = #{oldMesProcessId} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml index b5d3f8f9..1addc93d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml @@ -61,5 +61,15 @@ and BATCH_NO = #{batchNo} and REWORK_NO = #{reworkNo} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java index 6a404243..c866e984 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java @@ -301,6 +301,6 @@ public interface IDsPartService extends BaseService { * @param creatId * @return */ - List selectDsProcessProjectByCraftId(Long creatId); + List selectDsProcessProjectByCraftId(Long creatId,String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java index d221770f..95292c47 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java @@ -104,4 +104,11 @@ public interface IDsProcessProjectService extends BaseService selectOldMesByPid(Long oldMesProcessId); + + /** + * 查询检验项目(包含工序) + * @param processIdList + * @return + */ + List selectProjectByProcessIds(List processIdList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java index dcea70e1..8a8c9d5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java @@ -104,4 +104,12 @@ public interface IDsProcessService extends BaseService { * @return */ List selectDsProcessByCraftIdList(List craftIds); + + /** + * 根据工艺ID和工序号查询 + * @param craftId + * @param processNo + * @return + */ + List selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java index 2e8e2df1..83dac14b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java @@ -81,4 +81,14 @@ public interface IPrReworkProcessService extends BaseService selectPrReworkProcess(String reworkOrder, String partCode, String batchNo,String reworkNo); + + /** + * 查询返工工序 + * @param reworkOrder + * @param partCode + * @param batchNo + * @param processNo + * @return + */ + List selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 9f5f97cf..1ff4bc2e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -897,7 +897,7 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsProcessProjectByCraftId(Long craftId) { + public List selectDsProcessProjectByCraftId(Long craftId,String processNo) { //参数校验 if (craftId == null) { log.warn("工艺ID为空"); @@ -912,20 +912,22 @@ public class DsPartServiceImpl extends BaseServiceImpl processIdList = getProcessIdListByCraft(craft); + List processIdList = getProcessIdListByCraft(craft,processNo); if (CollectionUtils.isEmpty(processIdList)) { log.info("未找到工序ID, craftId: {}, reworkOrder: {}", craftId, craft.getReworkOrder()); return Collections.emptyList(); } //查询工序项目 - return processProjectService.selectDsProcessProjectByProcessIds(processIdList); + List processProjectEntityList = processProjectService.selectProjectByProcessIds(processIdList); + + return processProjectEntityList; } /** * 根据工艺获取工序ID列表(支持返工工艺和正常工艺) */ - private List getProcessIdListByCraft(DsCraftEntity craft) { + private List getProcessIdListByCraft(DsCraftEntity craft, String processNo) { if (craft == null) { return Collections.emptyList(); } @@ -934,10 +936,11 @@ public class DsPartServiceImpl extends BaseServiceImpl reworkProcessList = prReworkProcessService.selectPrReworkProcess( + List reworkProcessList = prReworkProcessService.selectPrReworkProcessByProcessNo( craft.getReworkOrder(), craft.getPartCode(), - craft.getPartVersions() + craft.getPartVersions(), + processNo ); return Optional.ofNullable(reworkProcessList) @@ -950,7 +953,8 @@ public class DsPartServiceImpl extends BaseServiceImpl processList = processService.selectDsProcessByCraftId(craft.getId()); + List processList = processService.selectDsProcessByCraftIdAndProcessNo(craft.getId(),processNo); + return Optional.ofNullable(processList) .orElse(Collections.emptyList()) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java index 88a2a07d..b9ff2272 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java @@ -118,4 +118,9 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl selectProjectByProcessIds(List processIdList) { + return processProjectMapper.selectProjectByProcessIds(processIdList); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java index 6e21aa07..7cbdab77 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java @@ -170,4 +170,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo) { + return processMapper.selectDsProcessByCraftIdAndProcessNo(craftId,processNo); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java index 1de07767..9ee75e54 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java @@ -81,4 +81,9 @@ public class PrReworkProcessServiceImpl extends BaseServiceImpl selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo) { + return reworkProcessMapper.selectPrReworkProcessByProcessNo(reworkOrder,partCode,batchNo,processNo); + } + }