提升机、四向车手动任务分配任务号

Junjie

2023-07-03 fa203c0094bd02bb062bbfec526379ee9502d800

提升机、四向车手动任务分配任务号

 src/main/java/com/zy/asrs/controller/LiftController.java

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.BasLift;
import com.zy.asrs.service.BasLiftService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.service.CommonService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -42,7 +43,7 @@
    @Autowired
    private BasLiftService basLiftService;
    @Autowired
    private WrkMastService wrkMastService;
    private CommonService commonService;

    @PostMapping("/table/lift/state")
    @ManagerAuth(memo = "提升机信息表")
@@ -202,7 +203,7 @@

                LiftAssignCommand assignCommand = new LiftAssignCommand();
                assignCommand.setLiftNo(liftSlave.getId().shortValue()); // 提升机编号
                assignCommand.setTaskNo((short) 9999);
                assignCommand.setTaskNo((short) commonService.getWorkNo(3));//获取任务号
                assignCommand.setTaskMode(param.getLiftTaskMode().shortValue());
                assignCommand.setAuto(false);//手动模式
                assignCommand.setLev(param.getLev());//移动楼层

 src/main/java/com/zy/asrs/controller/ShuttleController.java

@@ -15,6 +15,7 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -50,6 +51,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private CommonService commonService;

    @PostMapping("/table/shuttle/state")
    @ManagerAuth(memo = "四向穿梭车信息表")
@@ -314,7 +317,7 @@
                ShuttleTaskModeType shuttleTaskModeType = ShuttleTaskModeType.get(param.getShuttleTaskMode());
                assignCommand.setShuttleNo(shuttleSlave.getId().shortValue()); // 四向穿梭车编号
                assignCommand.setTaskMode(shuttleTaskModeType.id.shortValue());
                assignCommand.setTaskNo((short) 9999);
                assignCommand.setTaskNo((short) commonService.getWorkNo(3));//获取任务号
                assignCommand.setAuto(false);//手动模式

                if (MessageQueue.offer(SlaveType.Shuttle, shuttleSlave.getId(), new Task(3, assignCommand))) {