#

zjj

2024-06-25 c7d1a6835c419d99bc0006540bd20d5cdf98e3cb

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java

@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wcs.core.service.BusService;
import com.zy.asrs.wcs.core.service.TaskCtgService;
@@ -16,16 +17,12 @@
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java

@@ -1133,8 +1133,6 @@
                    MotionCtgType.SHUTTLE_MOVE
            ));

            task.setLiftNo(Integer.parseInt(transferLiftDevice.getDeviceNo()));
            taskService.updateById(task);
        }

        // 穿梭车开始充电

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java

@@ -61,7 +61,7 @@
        }

        //检测提升机是否有任务绑定
        boolean liftResult = Utils.checkLiftHasBinding(deviceNo, String.valueOf(motion.getTaskNo()));
        boolean liftResult = Utils.checkLiftHasBinding(liftProtocol.getLiftNo(), String.valueOf(motion.getTaskNo()));
        if (liftResult) {
            //存在任务，禁止执行
            return false;
@@ -204,7 +204,7 @@
                }

                if (motion.getReleaseLift() == 1) {//释放提升机
                    task.setLiftNo(null);
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());
                    if (!taskService.updateById(task)) {
                        return false;
@@ -233,7 +233,7 @@
                }

                if (motion.getReleaseLift() == 1) {//释放提升机
                    task.setLiftNo(null);
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());
                    if (!taskService.updateById(task)) {
                        return false;
@@ -289,7 +289,7 @@
                }

                if (motion.getReleaseLift() == 1) {//释放提升机
                    task.setLiftNo(null);
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());
                    if (!taskService.updateById(task)) {
                        return false;

 zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml

@@ -115,7 +115,7 @@

    <select id="selectWorkingByLift" resultType="com.zy.asrs.wcs.core.entity.Task">
        select * from wcs_task
        where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403)
        where task_sts in (1,2,3,101,102,103,201,202,203,301,302,303,401,402,403)
        and lift_no = #{liftNo}
        <if test="taskNo!=null">
            and task_no != #{taskNo}