自动分派

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.basic.excel.PlatingExcel;
 import org.springblade.desk.basic.pojo.entity.Plating;
 import org.springblade.desk.basic.pojo.vo.PlatingVO;
+import org.springblade.desk.dashboard.pojo.entity.BsPlatingEntity;
 
 import java.util.List;
 
@@ -37,4 +38,6 @@ public interface PlatingMapper extends BaseMapper<Plating> {
 	 * @return List<PlatingExcel>
 	 */
 	List<PlatingExcel> exportPlating(@Param("ew") Wrapper<Plating> queryWrapper);
+
+	Plating selectBsPlatingByPlating(@Param("plating") String plating);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml

@@ -28,4 +28,9 @@
     <select id="exportPlating" resultType="org.springblade.desk.basic.excel.PlatingExcel">
         SELECT * FROM BA_PLATING ${ew.customSqlSegment}
     </select>
+    <select id="selectBsPlatingByPlating" resultType="org.springblade.desk.basic.pojo.entity.Plating">
+         SELECT * FROM BA_PLATING WHERE is_deleted = 0 and PLATING = #{plating}
+    </select>
+
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java

@@ -9,6 +9,7 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.basic.excel.PlatingExcel;
 import org.springblade.desk.basic.pojo.entity.Plating;
 import org.springblade.desk.basic.pojo.vo.PlatingVO;
+import org.springblade.desk.dashboard.pojo.entity.BsPlatingEntity;
 
 import java.util.List;
 
@@ -41,4 +42,11 @@ public interface IPlatingService extends BaseService<Plating> {
      * @param vo
      */
 	void setVOValue(PlatingVO vo);
+
+	/**
+	 * 根据镀种查询
+	 * @param plate
+	 * @return
+	 */
+	Plating selectBsPlatingByPlating(String plate);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java

@@ -16,6 +16,7 @@ import org.springblade.desk.basic.mapper.PlatingMapper;
 import org.springblade.desk.basic.pojo.entity.Plating;
 import org.springblade.desk.basic.pojo.vo.PlatingVO;
 import org.springblade.desk.basic.service.IPlatingService;
+import org.springblade.desk.dashboard.pojo.entity.BsPlatingEntity;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -58,4 +59,9 @@ public class PlatingServiceImpl extends BaseServiceImpl<PlatingMapper, Plating>
     public void setVOValue(PlatingVO vo) {
 
     }
+
+	@Override
+	public Plating selectBsPlatingByPlating(String plating) {
+		return baseMapper.selectBsPlatingByPlating(plating);
+	}
 }

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

@@ -399,6 +399,17 @@ public class DsTaskingController extends BladeController {
 		return R.data(detail);
 	}
 
+	/**
+	 * 工艺任务自动分派
+	 */
+	@GetMapping("/automaticDispatching")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "工艺任务-自动分派", description  = "taskingId")
+	public R automaticDispatching(@RequestParam String taskingId) {
+		boolean b =  dsTaskingService.automaticDispatching(taskingId);
+		return R.data(b);
+	}
+
 
 
 	@GetMapping("/syncPart")

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

@@ -244,4 +244,11 @@ public interface IDsTaskingService extends BaseService<DsTaskingEntity> {
 	 * @return
 	 */
 	List<DsTaskingEntity> selectTaskingByPartCode(String partCode, Integer taskStatus, String taskType);
+
+	/**
+	 * 自动分派
+	 * @param taskingId
+	 * @return
+	 */
+    boolean automaticDispatching(String taskingId);
 }

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

@@ -36,9 +36,13 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.desk.basic.pojo.entity.BasicClazz;
 import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart;
+import org.springblade.desk.basic.pojo.entity.Plating;
+import org.springblade.desk.basic.service.IBasicClazzService;
 import org.springblade.desk.basic.service.ICraftAbilityService;
 import org.springblade.desk.basic.service.ILocallyPlatedPartService;
+import org.springblade.desk.basic.service.IPlatingService;
 import org.springblade.desk.common.constant.BizTypeConstant;
 import org.springblade.desk.common.service.IMesNotifyMessageService;
 import org.springblade.desk.dashboard.constant.DsPartConstant;
@@ -106,7 +110,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	IUserClient userClient;
 
 	@Autowired
-	IBsPlatingService platingService;
+	IPlatingService platingService;
 
 	@Autowired
 	IDsCraftService craftService;
@@ -182,6 +186,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	@Autowired
 	IMeasurementRecordsService measurementRecordsService;
 
+	@Autowired
+	IBasicClazzService basicClazzService;
+
+
 	@Override
 	public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) {
 		List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking);
@@ -1850,6 +1858,32 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		return taskingMapper.selectTaskingByPartCode(partCode,taskStatus,taskType);
 	}
 
+	@Override
+	public boolean automaticDispatching(String taskingId) {
+		DsTaskingEntity tasking = this.getById(taskingId);
+		if(tasking == null){
+			return false;
+		}
+		//获取镀种
+		if(StringUtils.isEmpty(tasking.getPlate())){
+			return false;
+		}
+		//根据镀种查询镀种分类
+//		Plating plating = platingService.selectBsPlatingByPlating(tasking.getPlate());
+//		if(plating == null && plating.getBcId() == null){
+//			return false;
+//		}
+//
+//		BasicClazz basicClazz = basicClazzService.getById(plating.getBcId());
+//		if(basicClazz == null){
+//			return false;
+//		}
+		//获取镀种分类对应的人员
+
+
+		return false;
+	}
+
 	/**
 	 * 单个任务独立事务处理
 	 */