返工工艺导入

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

@@ -151,7 +151,7 @@ public class DsCraftController extends BladeController {
 	 */
 	@GetMapping("/listByPart")
 	@ApiOperationSupport(order = 1)
-	@Operation(summary = "获取版本号", description  = "传入零件ID")
+	@Operation(summary = "根据零件ID查询工艺", description  = "传入零件ID")
 	public R<List<DsCraftVO>> listByPart(Long partId) {
 		return R.data(dsCraftService.selectDsCraftByPartId(partId));
 	}
@@ -183,4 +183,17 @@ public class DsCraftController extends BladeController {
 		return R.status(dsCraftService.craftBatchCopy(craftVO));
 	}
 
+	/**
+	 * 根据零件号查询工艺
+	 */
+	@GetMapping("/listByPartCode")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "根据零件号查询工艺", description  = "传入零件partCode")
+	public R<List<DsCraftVO>> listByPartCode(String partCode) {
+		return R.data(dsCraftService.selectDsCraftByPartCode(partCode));
+	}
+
+
+
+
 }

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

@@ -213,7 +213,7 @@
     </select>
 
     <select id="selectDsPartByPatCode" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartEntity">
-         select * from DS_PART where PART_CODE = #{partCode}
+         select * from DS_PART where PART_CODE = #{partCode} AND IS_DELETED = 0
     </select>
 
     <select id="selectDsPartLoseEfficacy" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartEntity">

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

@@ -222,4 +222,11 @@ public interface IDsCraftService extends BaseService<DsCraftEntity> {
 	 * @return
 	 */
     boolean craftBatchCopy(DsCraftVO craftVO);
+
+	/**
+	 * 根据零件号查询工艺
+	 * @param partCode
+	 * @return
+	 */
+	List<DsCraftVO> selectDsCraftByPartCode(String partCode);
 }

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

@@ -521,4 +521,18 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 
 		return true;
 	}
+
+	@Override
+	public List<DsCraftVO> selectDsCraftByPartCode(String partCode) {
+		List<DsPartEntity> dsPartEntityList = partService.selectDsPartByPatCode(partCode);
+		if(CollectionUtils.isEmpty(dsPartEntityList)){
+			return List.of();
+		}
+		DsPartEntity dsPart = dsPartEntityList.get(0);
+		if(dsPart != null && dsPart.getId() != null){
+			return this.selectDsCraftByPartId(dsPart.getId());
+		}
+
+		return List.of();
+	}
 }