修改查询检验项目接口

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;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java

@@ -77,4 +77,6 @@ public interface DsProcessMapper extends BaseMapper<DsProcessEntity> {
     List<DsProcessEntity> selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId);
 
     List<DsProcessEntity> selectDsProcessByCraftIdList(@Param("craftIds") List<Long> craftIds);
+
+	List<DsProcessEntity> selectDsProcessByCraftIdAndProcessNo(@Param("craftId")Long craftId, @Param("processNo")String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java

@@ -77,4 +77,6 @@ public interface DsProcessProjectMapper extends BaseMapper<DsProcessProjectEntit
     List<DsProcessProjectEntity> selectDsProcessProjectByProcessId(@Param("processId")Long processId);
 
 	List<DsProcessProjectEntity> selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId);
+
+	List<DsProcessProjectVO> selectProjectByProcessIds(@Param("processIds") List<Long> processIdList);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java

@@ -68,4 +68,9 @@ public interface PrReworkProcessMapper extends BaseMapper<PrReworkProcessEntity>
 															  @Param("partCode") String partCode,
 															  @Param("batchNo") String batchNo,
 															  @Param("reworkNo") String reworkNo);
+
+	List<PrReworkProcessEntity> selectPrReworkProcessByProcessNo(@Param("reworkOrder")String reworkOrder,
+																 @Param("partCode") String partCode,
+																 @Param("batchNo") String batchNo,
+																 @Param("processNo") String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml

@@ -60,6 +60,16 @@
             #{craftId}
         </foreach>
     </select>
+    <select id="selectDsProcessByCraftIdAndProcessNo"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity">
+         select * from DS_PROCESS
+         where IS_DELETED = 0
+         and CRAFT_ID = #{craftId}
+         <if test="processNo != null and processNo !=''">
+             PROCESS_NO = #{processNo}
+         </if>
+          order by PROCESS_NO asc
+    </select>
 
 
 </mapper>

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}
     </select>
+    <select id="selectProjectByProcessIds"
+            resultType="org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO">
+        select dp.PROCESS_NO,pp.* from DS_PROCESS_PROJECT pp
+        left join ds_process dp on pp.PROCESS_ID =dp.ID
+        where pp.IS_DELETED = 0
+         and  process_id in
+        <foreach collection="processIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 
 
 </mapper>

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}
     </select>
+    <select id="selectPrReworkProcessByProcessNo"
+            resultType="org.springblade.desk.dashboard.pojo.entity.PrReworkProcessEntity">
+        select * from PR_REWORK_PROCESS where is_deleted = 0
+            and REWORK_CODE = #{reworkOrder}
+            and PART_CODE = #{partCode}
+            and BATCH_NO = #{batchNo}
+            <if test="processNo != null and processNo !=''">
+                and PROCESS_NO = #{processNo}
+            </if>
+    </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java

@@ -301,6 +301,6 @@ public interface IDsPartService extends BaseService<DsPartEntity> {
 	 * @param creatId
 	 * @return
 	 */
-	List<DsProcessProjectEntity> selectDsProcessProjectByCraftId(Long creatId);
+	List<DsProcessProjectVO> selectDsProcessProjectByCraftId(Long creatId,String processNo);
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java

@@ -104,4 +104,11 @@ public interface IDsProcessProjectService extends BaseService<DsProcessProjectEn
 	 * @return
 	 */
     List<DsProcessProjectEntity> selectOldMesByPid(Long oldMesProcessId);
+
+	/**
+	 * 查询检验项目（包含工序）
+	 * @param processIdList
+	 * @return
+	 */
+	List<DsProcessProjectVO> selectProjectByProcessIds(List<Long> processIdList);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java

@@ -104,4 +104,12 @@ public interface IDsProcessService extends BaseService<DsProcessEntity> {
 	 * @return
 	 */
 	List<DsProcessEntity> selectDsProcessByCraftIdList(List<Long> craftIds);
+
+	/**
+	 * 根据工艺ID和工序号查询
+	 * @param craftId
+	 * @param processNo
+	 * @return
+	 */
+	List<DsProcessEntity> selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java

@@ -81,4 +81,14 @@ public interface IPrReworkProcessService extends BaseService<PrReworkProcessEnti
 	 * @return
 	 */
 	List<PrReworkProcessEntity> selectPrReworkProcess(String reworkOrder, String partCode, String batchNo,String reworkNo);
+
+	/**
+	 * 查询返工工序
+	 * @param reworkOrder
+	 * @param partCode
+	 * @param batchNo
+	 * @param processNo
+	 * @return
+	 */
+	List<PrReworkProcessEntity> selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -897,7 +897,7 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 	}
 
 	@Override
-	public List<DsProcessProjectEntity> selectDsProcessProjectByCraftId(Long craftId) {
+	public List<DsProcessProjectVO> selectDsProcessProjectByCraftId(Long craftId,String processNo) {
 		//参数校验
 		if (craftId == null) {
 			log.warn("工艺ID为空");
@@ -912,20 +912,22 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		}
 
 		//获取工艺对应的工序ID列表
-		List<Long> processIdList = getProcessIdListByCraft(craft);
+		List<Long> processIdList = getProcessIdListByCraft(craft,processNo);
 		if (CollectionUtils.isEmpty(processIdList)) {
 			log.info("未找到工序ID, craftId: {}, reworkOrder: {}", craftId, craft.getReworkOrder());
 			return Collections.emptyList();
 		}
 
 		//查询工序项目
-		return processProjectService.selectDsProcessProjectByProcessIds(processIdList);
+		List<DsProcessProjectVO> processProjectEntityList = processProjectService.selectProjectByProcessIds(processIdList);
+
+		return processProjectEntityList;
 	}
 
 	/**
 	 * 根据工艺获取工序ID列表（支持返工工艺和正常工艺）
 	 */
-	private List<Long> getProcessIdListByCraft(DsCraftEntity craft) {
+	private List<Long> getProcessIdListByCraft(DsCraftEntity craft, String processNo) {
 		if (craft == null) {
 			return Collections.emptyList();
 		}
@@ -934,10 +936,11 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 
 		if (isRework) {
 			// 返工工艺：从返工工序表查询
-			List<PrReworkProcessEntity> reworkProcessList = prReworkProcessService.selectPrReworkProcess(
+			List<PrReworkProcessEntity> 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<DsPartMapper, DsPartEntit
 					.collect(Collectors.toList());
 		} else {
 			// 正常工艺：从工序表查询
-			List<DsProcessEntity> processList = processService.selectDsProcessByCraftId(craft.getId());
+			List<DsProcessEntity> processList = processService.selectDsProcessByCraftIdAndProcessNo(craft.getId(),processNo);
+
 
 			return Optional.ofNullable(processList)
 					.orElse(Collections.emptyList())

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java

@@ -118,4 +118,9 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl<DsProcessProjec
 		return processProjectMapper.selectOldMesByPid(oldMesProcessId);
 	}
 
+	@Override
+	public List<DsProcessProjectVO> selectProjectByProcessIds(List<Long> processIdList) {
+		return processProjectMapper.selectProjectByProcessIds(processIdList);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java

@@ -170,4 +170,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl<DsProcessMapper, DsPro
 		return processMapper.selectDsProcessByCraftIdList(craftIds);
 	}
 
+	@Override
+	public List<DsProcessEntity> selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo) {
+		return processMapper.selectDsProcessByCraftIdAndProcessNo(craftId,processNo);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java

@@ -81,4 +81,9 @@ public class PrReworkProcessServiceImpl extends BaseServiceImpl<PrReworkProcessM
 		return reworkProcessMapper.selectPrReworkProcessReworkNo(reworkOrder,partCode,batchNo,reworkNo);
 	}
 
+	@Override
+	public List<PrReworkProcessEntity> selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo) {
+		return reworkProcessMapper.selectPrReworkProcessByProcessNo(reworkOrder,partCode,batchNo,processNo);
+	}
+
 }