|
@@ -15,6 +15,7 @@ import com.github.zuihou.base.R;
|
|
|
import com.github.zuihou.base.service.SuperServiceImpl;
|
|
|
import com.github.zuihou.business.DemoLine.DemoCacheKey;
|
|
|
import com.github.zuihou.business.DemoLine.DemoLineConstant;
|
|
|
+import com.github.zuihou.business.DemoLine.YunjianConstant;
|
|
|
import com.github.zuihou.business.aps.algorithm.ga.GAScheduler;
|
|
|
import com.github.zuihou.business.aps.instance.domain.basicdata.CandidateProcess;
|
|
|
import com.github.zuihou.business.aps.instance.domain.basicdata.Instance;
|
|
@@ -41,6 +42,7 @@ import com.github.zuihou.business.productionResourceCenter.entity.Productionreso
|
|
|
import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
|
|
|
import com.github.zuihou.business.productionResourceCenter.service.RepairService;
|
|
|
import com.github.zuihou.business.util.DynamicRabbitMq;
|
|
|
+import com.github.zuihou.business.util.MsgUtil;
|
|
|
import com.github.zuihou.common.constant.BizConstant;
|
|
|
import com.github.zuihou.common.constant.CodeRuleModule;
|
|
|
import com.github.zuihou.common.constant.ParameterKey;
|
|
@@ -153,6 +155,8 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
|
|
|
private ProductionresourceBizMapper productionresourceBizMapper;
|
|
|
@Autowired
|
|
|
private MMeterialReceiveLogMapper mMeterialReceiveLogMapper;
|
|
|
+ @Autowired
|
|
|
+ private MsgUtil msgUtil;
|
|
|
|
|
|
@Override
|
|
|
public IPage<Order> pageList(IPage page,String sustDesc, LbqWrapper<Order> wrapper) {
|
|
@@ -760,6 +764,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
|
|
|
|
|
|
@Override
|
|
|
public R reschedulingPlanTasks() {
|
|
|
+ msgUtil.redis_set(YunjianConstant.YUNJIAN_SHEDULE_FLAG,YunjianConstant.YUNJIAN_SHEDULE_FLAG);
|
|
|
// 找出当前所有的订单计划还未开始加工的工件进行重排
|
|
|
QueryWrapper<Plan> planWrapper = new QueryWrapper<Plan>();
|
|
|
planWrapper.eq("plan_status", "2");
|
|
@@ -921,6 +926,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
|
|
|
taskList.add(task);
|
|
|
}
|
|
|
taskService.updateBatchById(taskList);
|
|
|
+ msgUtil.redis_del(YunjianConstant.YUNJIAN_SHEDULE_FLAG);
|
|
|
return R.success();
|
|
|
}
|
|
|
|