Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java

@@ -22,7 +22,7 @@ import java.util.List;
 )
 public interface IErpMesRbWoClient {
 
-	String API_PREFIX = "/feign/client/mesrbwo";
+	String API_PREFIX = "/feign/erpdata/mesrbwo";
 	String GET_LIST = API_PREFIX + "/getList";
 	String GET_WO = API_PREFIX + "/getWoOne";
 	String SYN_MES_WO = API_PREFIX + "/synMesRbWo";

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

@@ -279,11 +279,9 @@ public class DsPartController extends BladeController {
 	 */
 	@GetMapping("/test")
 	public R test(@RequestParam String partCode,
-				  @RequestParam String roamNo,
-				  @RequestParam String rank,
 				  @RequestParam String partVersion) {
 
-		return R.data(dsPartService.selectPartCraft(partCode,roamNo,rank,partVersion));
+		return R.data(dsPartService.getPartSubList(partCode,partVersion));
 	}
 
 

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

@@ -269,4 +269,22 @@ public interface IDsPartService extends BaseService<DsPartEntity> {
 	 * @return
 	 */
 	DsPartVersionEntity getNewPartVersion(String partCode);
+
+	/**
+	 * 获取子件
+	 * @param partCode
+	 * @param partVersion
+	 * @return
+	 */
+	List<DsPartEntity> getPartSubList(String partCode,String partVersion);
+
+
+	/**
+	 * 玻璃饼：查询工序下的工装
+	 * @param partCode
+	 * @param roamNo
+	 * @param partVersion
+	 * @return
+	 */
+	List<DsPartEntity> getClassCake(String partCode,String roamNo,String partVersion);
 }

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

@@ -714,6 +714,38 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		return null;
 	}
 
+	@Override
+	public List<DsPartEntity> getPartSubList(String partCode, String partVersion) {
+		//校验零件号
+		if(StringUtils.isEmpty(partCode)){
+			throw new ServiceException("零件号不能为空");
+		}
+		//查询零件是否存在
+		List<DsPartEntity> dsPartEntityList = this.selectDsPartByPatCode(partCode);
+		if(CollectionUtils.isEmpty(dsPartEntityList)){
+			throw new ServiceException("零件不存在");
+		}
+
+		//查询零件
+		DsPartEntity partEntity = this.selectDsPartByPatCodeAndVersion(partCode, partVersion);
+
+		List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
+
+		List<Long> validChildPartIds = partRelationEntityList.stream()
+				.map(DsPartRelationEntity::getChildPartId)
+				.filter(Objects::nonNull)
+				.collect(Collectors.toList());
+
+		List<DsPartEntity> dsPartEntityList1 = this.selectDsPartByIds(validChildPartIds);
+
+		return dsPartEntityList1;
+	}
+
+	@Override
+	public List<DsPartEntity> getClassCake(String partCode, String roamNo, String partVersion) {
+		return null;
+	}
+
 	/**
 	 * 创建维护任务
 	 */