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 60929d3d..9b040123 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 @@ -403,10 +403,11 @@ public class DsTaskingController extends BladeController { @GetMapping("/syncPart") - public R syncPart(@RequestParam String StartTime, - @RequestParam String endTime) { + public R syncPart( @RequestParam(required = false)String StartTime, + @RequestParam(required = false)String endTime, + @RequestParam(required = false)String partCode) { - boolean b = dsTaskingService.syncPart(StartTime,endTime); + boolean b = dsTaskingService.syncPart(StartTime,endTime,partCode); return R.data(b); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java index ea4cd62c..9f9b9f27 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java @@ -130,5 +130,7 @@ public interface DsTaskingMapper extends BaseMapper { */ DsPartEntity getOldMesPartByPartCode(@Param("partCode") String partCode); - List getOldMesAllPart(@Param("startTime") String startTime,@Param("endTime") String endTime); + List getOldMesAllPart(@Param("startTime") String startTime, + @Param("endTime") String endTime, + @Param("partCode") String partCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml index 9ea4b8b4..57c1632b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml @@ -139,8 +139,15 @@ 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 f8a50aff..668b27de 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 @@ -234,5 +234,5 @@ public interface IDsTaskingService extends BaseService { * 同步零件 * @return */ - boolean syncPart(String startTime, String endTime); + boolean syncPart( String startTime, String endTime,String partCode); } 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 d84e4e28..d3398770 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 @@ -41,10 +41,8 @@ import org.springblade.desk.dashboard.pojo.vo.*; import org.springblade.desk.dashboard.excel.DsTaskingExcel; import org.springblade.desk.dashboard.mapper.DsTaskingMapper; import org.springblade.desk.dashboard.service.*; -import org.springblade.desk.order.pojo.entity.MoldApply; import org.springblade.desk.order.pojo.entity.MoldDemand; import org.springblade.desk.order.pojo.entity.YieldOrder; -import org.springblade.desk.order.service.IMoldApplyService; import org.springblade.desk.order.service.IMoldDemandService; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.produce.service.IWorkOrderService; @@ -1560,9 +1558,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl dsPartEntityList = taskingMapper.getOldMesAllPart(startTime,endTime); + List dsPartEntityList = taskingMapper.getOldMesAllPart(startTime,endTime,partCode); for (DsPartEntity partEntity : dsPartEntityList) { // 2. 递归处理零件及其子件 @@ -1573,7 +1571,6 @@ public class DsTaskingServiceImpl extends BaseServiceImpl