From 6a88730232aa0ec28c45bcd2c87138f6ba2aa8f8 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Tue, 2 Jun 2026 15:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/mapper/PlatingMapper.java | 3 ++ .../desk/basic/mapper/PlatingMapper.xml | 5 +++ .../desk/basic/service/IPlatingService.java | 8 +++++ .../service/impl/PlatingServiceImpl.java | 6 ++++ .../controller/DsTaskingController.java | 11 ++++++ .../dashboard/service/IDsTaskingService.java | 7 ++++ .../service/impl/DsTaskingServiceImpl.java | 36 ++++++++++++++++++- 7 files changed, 75 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java index efa83ef88..f302df03e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java +++ b/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 { * @return List */ List exportPlating(@Param("ew") Wrapper queryWrapper); + + Plating selectBsPlatingByPlating(@Param("plating") String plating); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml index a384c9bba..41abb08eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml @@ -28,4 +28,9 @@ + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java index d3da4f4cb..c1074b1a2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java +++ b/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 { * @param vo */ void setVOValue(PlatingVO vo); + + /** + * 根据镀种查询 + * @param plate + * @return + */ + Plating selectBsPlatingByPlating(String plate); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java index ffb7dc1c3..5f2317107 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java +++ b/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 public void setVOValue(PlatingVO vo) { } + + @Override + public Plating selectBsPlatingByPlating(String plating) { + return baseMapper.selectBsPlatingByPlating(plating); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java index 69578fedc..2a94af5ec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java +++ b/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") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java index eeb830ba3..1040b17d9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java @@ -244,4 +244,11 @@ public interface IDsTaskingService extends BaseService { * @return */ List selectTaskingByPartCode(String partCode, Integer taskStatus, String taskType); + + /** + * 自动分派 + * @param taskingId + * @return + */ + boolean automaticDispatching(String taskingId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 2cc38269c..b2eb83aab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/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 selectAssignList(IPage page, DsTaskingVO dsTasking) { List dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking); @@ -1850,6 +1858,32 @@ public class DsTaskingServiceImpl extends BaseServiceImpl