排产相关-sjx

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<List<String>> selectTeam() {
+		return R.data(workOrderService.selectTeam());
+	}
+
+	/**
+	 * 车间订单表 排产
+	 */
+	@GetMapping("/selectEquip")
+	@Operation(summary = "获取设备列表")
+	public R<List<String>> selectEquip() {
+		return R.data(workOrderService.selectEquip());
+	}
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java

@@ -69,4 +69,8 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
 
 	List<WorkOrderDto> selectSchedulingCount(WorkOrderDto workOrderDto);
 
+	List<String> selectTeam();
+
+	List<String> selectEquip();
+
 }

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;
     </select>
 
+    <select id="selectTeam" resultType="java.lang.String">
+        SELECT
+        ts_name as "name"
+        FROM BS_TEAM_SET
+    </select>
+
+    <select id="selectEquip" resultType="java.lang.String">
+        SELECT
+            device_name as "name"
+        FROM MES_EQUIPMENT
+    </select>
+
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java

@@ -80,4 +80,8 @@ public interface IWorkOrderService extends BaseService<WorkOrderEntity> {
 	void sendWorkOrderToOldMes(List<WorkOrderEntity> workOrderEntityList);
 
 	List<WorkOrderDto> schedulingCount(WorkOrderDto workOrder);
+
+	List<String> selectTeam();
+
+	List<String> selectEquip();
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -420,6 +420,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return list;
     }
 
+    @Override
+    public List<String> selectTeam() {
+        return baseMapper.selectTeam();
+    }
+
+    @Override
+    public List<String> selectEquip() {
+        return baseMapper.selectEquip();
+    }
+
     void calculateCr(List<YieldOrderEntity> list) {
 		//查询订单下的工序，计算cr值
 		for (YieldOrderEntity entity : list) {

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();
     }