diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java index 23932b98..e7e89464 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java @@ -211,4 +211,22 @@ public class WorkOrderController extends BladeController { return R.success(); } + /** + * 车间订单表 排产 + */ + @GetMapping("/selectTeam") + @Operation(summary = "获取班组列表") + public R> selectTeam() { + return R.data(workOrderService.selectTeam()); + } + + /** + * 车间订单表 排产 + */ + @GetMapping("/selectEquip") + @Operation(summary = "获取设备列表") + public R> selectEquip() { + return R.data(workOrderService.selectEquip()); + } + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java index 72ae9eda..905c9ba8 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java @@ -69,4 +69,8 @@ public interface WorkOrderMapper extends BaseMapper { List selectSchedulingCount(WorkOrderDto workOrderDto); + List selectTeam(); + + List selectEquip(); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index b036afaf..e89984eb 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -159,4 +159,16 @@ GROUP BY b.WC_NAME, a.WORK_CENTER_ID; + + + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java index 9f6d20f4..a8c192b3 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java @@ -80,4 +80,8 @@ public interface IWorkOrderService extends BaseService { void sendWorkOrderToOldMes(List workOrderEntityList); List schedulingCount(WorkOrderDto workOrder); + + List selectTeam(); + + List selectEquip(); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 3ddafce7..c6ec9f1e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -420,6 +420,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl selectTeam() { + return baseMapper.selectTeam(); + } + + @Override + public List selectEquip() { + return baseMapper.selectEquip(); + } + void calculateCr(List list) { //查询订单下的工序,计算cr值 for (YieldOrderEntity entity : list) { diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/task/SchedulingJob.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/task/SchedulingJob.java index b6c87ff2..8645efc5 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/task/SchedulingJob.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/task/SchedulingJob.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; public class SchedulingJob { private final IWorkOrderService workOrderService; - @Scheduled(cron = "* * 1 * * ?") + @Scheduled(cron = "0 0 8,12,16,20 * * ? ") public void schedulingJob() { workOrderService.scheduling(); }