Merge remote-tracking branch 'origin/glccwcs' into glccwcs

ZY

2025-04-07 a662099c1fdd8d3e6da2d6b167758a4bc548ccff

Merge remote-tracking branch 'origin/glccwcs' into glccwcs

# Conflicts:
#	src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
#	src/main/resources/application-prod.yml

 src/main/java/com/zy/asrs/entity/DevpTask.java

New file
@@ -0,0 +1,247 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("wcs_devp_task")
public class DevpTask implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * wms任务号
     */
    @ApiModelProperty(value = "wms任务号")
    @TableId(value = "task_no", type = IdType.INPUT)
    @TableField("task_no")
    private String taskNo;

    /**
     * 任务状态 1: 接收  2: 派发  3: 完结  4: 取消
     */
    @ApiModelProperty(value = "任务状态 1: 接收  2: 派发  5: 完结  4: 取消  ")
    private Integer status;

    /**
     * 任务号
     */
    @ApiModelProperty(value = "任务号")
    @TableField("wrk_no")
    private Integer wrkNo;

    /**
     * 任务时间(接收时间)
     */
    @ApiModelProperty(value = "任务时间(接收时间)")
    @TableField("create_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;


    /**
     * 起点
     */
    @ApiModelProperty(value = "起点")
    @TableField("start_point")
    private String startPoint;

    /**
     * 终点
     */
    @ApiModelProperty(value = "终点")
    @TableField("target_point")
    private String targetPoint;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String memo;

    /**
     * 条码
     */
    @ApiModelProperty(value = "条码")
    private String barcode;

    /**
     * 派发时间
     */
    @ApiModelProperty(value = "派发时间")
    @TableField("assign_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date assignTime;

    /**
     * 执行时间
     */
    @ApiModelProperty(value = "执行时间")
    @TableField("execute_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date executeTime;

    /**
     * 完结时间
     */
    @ApiModelProperty(value = "完结时间")
    @TableField("complete_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

    /**
     * 取消时间
     */
    @ApiModelProperty(value = "取消时间")
    @TableField("cancel_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date cancelTime;

    /**
     * 工作状态
     */
    @ApiModelProperty(value = "工作状态")
    @TableField("wrk_sts")
    private Integer wrkSts;


    public DevpTask() {
    }


    public String getStatus$() {
        if (null == this.status) {
            return null;
        }
        switch (this.status) {
            case 1:
                return "接收";
            case 2:
                return "派发";
            case 3:
                return "步序完成";
            case 4:
                return "取消";
            case 5:
                return "完结";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }


    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAssignTime$() {
        if (Cools.isEmpty(this.assignTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
    }

    public String getExecuteTime$() {
        if (Cools.isEmpty(this.executeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
    }

    public String getCompleteTime$() {
        if (Cools.isEmpty(this.completeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
    }

    public String getCancelTime$() {
        if (Cools.isEmpty(this.cancelTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
    }

    public String getWrkSts$() {
        BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
        BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
        if (!Cools.isEmpty(basWrkStatus)) {
            return String.valueOf(basWrkStatus.getWrkDesc());
        }
        return null;
    }

    /**
     * 获取持续时间
     */
    public String getDurationTime() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }

        Date endDate = new Date();
        if (!Cools.isEmpty(this.assignTime)) {
            endDate = this.assignTime;
        }

        //用来获取两个时间相差的毫秒数
        long l = this.createTime.getTime() - endDate.getTime();

        //分别计算相差的天、小时、分、秒
        long day = l / (24 * 60 * 60 * 1000);
        long hour = (l / (60 * 60 * 1000) - day * 24);
        long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
        long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);

        return Math.abs(day) + "天" + Math.abs(hour) + "小时" + Math.abs(min) + "分" + Math.abs(s) + "秒";
    }

}

 src/main/java/com/zy/asrs/entity/DevpTaskLog.java

New file
@@ -0,0 +1,332 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
import com.zy.asrs.service.BasWrkStatusService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("wcs_devp_task_log")
public class DevpTaskLog implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * wms任务号
     */
    @ApiModelProperty(value = "wms任务号")
    @TableField("task_no")
    private String taskNo;

    /**
     * 任务状态 1: 接收  2: 派发  3: 完结  4: 取消
     */
    @ApiModelProperty(value = "任务状态 1: 接收  2: 派发  3: 完结  4: 取消  ")
    private Integer status;

    /**
     * 任务号
     */
    @ApiModelProperty(value = "任务号")
    @TableField("wrk_no")
    private Integer wrkNo;

    /**
     * 任务时间(接收时间)
     */
    @ApiModelProperty(value = "任务时间(接收时间)")
    @TableField("create_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 任务类型
     */
    @ApiModelProperty(value = "任务类型")
    @TableField("io_type")
    private Integer ioType;

    /**
     * 优先级
     */
    @ApiModelProperty(value = "优先级")
    @TableField("io_pri")
    private Double ioPri;

    /**
     * 起点
     */
    @ApiModelProperty(value = "起点")
    @TableField("start_point")
    private String startPoint;

    /**
     * 终点
     */
    @ApiModelProperty(value = "终点")
    @TableField("target_point")
    private String targetPoint;

    /**
     * 修改人员
     */
    @ApiModelProperty(value = "修改人员")
    @TableField("modi_user")
    private Long modiUser;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @TableField("modi_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date modiTime;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String memo;

    /**
     * 条码
     */
    @ApiModelProperty(value = "条码")
    private String barcode;

    /**
     * 派发时间
     */
    @ApiModelProperty(value = "派发时间")
    @TableField("assign_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date assignTime;

    /**
     * 执行时间
     */
    @ApiModelProperty(value = "执行时间")
    @TableField("execute_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date executeTime;

    /**
     * 完结时间
     */
    @ApiModelProperty(value = "完结时间")
    @TableField("complete_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

    /**
     * 取消时间
     */
    @ApiModelProperty(value = "取消时间")
    @TableField("cancel_time")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date cancelTime;

    /**
     * 工作状态
     */
    @ApiModelProperty(value = "工作状态")
    @TableField("wrk_sts")
    private Integer wrkSts;

    /**
     * 堆垛机号
     */
    @ApiModelProperty(value = "堆垛机号")
    @TableField("crn_no")
    private Integer crnNo;

    /**
     * 指令执行步序
     */
    @ApiModelProperty(value = "指令执行步序")
    @TableField("command_step")
    private Integer commandStep;

//    @ApiModelProperty(value= "")
//    @TableId(value = "id", type = IdType.AUTO)
//    private Long id;


    @ApiModelProperty(value = "移库标记")
    @TableField("transfer_mark")
    private Integer transferMark;

    public DevpTaskLog() {
    }

    public DevpTaskLog(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Double ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts, Integer crnNo, Integer commandStep) {
        this.taskNo = taskNo;
        this.status = status;
        this.wrkNo = wrkNo;
        this.createTime = createTime;
        this.ioType = ioType;
        this.ioPri = ioPri;
        this.startPoint = startPoint;
        this.targetPoint = targetPoint;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.memo = memo;
        this.barcode = barcode;
        this.assignTime = assignTime;
        this.executeTime = executeTime;
        this.completeTime = completeTime;
        this.cancelTime = cancelTime;
        this.wrkSts = wrkSts;
        this.crnNo = crnNo;
        this.commandStep = commandStep;
    }

    public DevpTaskLog(TaskWrk taskWrk) {
        this.taskNo = taskWrk.getTaskNo();
        this.status = taskWrk.getStatus();
        this.wrkNo = taskWrk.getWrkNo();
        this.createTime = taskWrk.getCreateTime();
        this.ioType = taskWrk.getIoType();
        if (Cools.isEmpty(taskWrk.getIoPri())) {
            taskWrk.setIoPri(1);
        }
        this.ioPri = (double) taskWrk.getIoPri();
        this.startPoint = taskWrk.getStartPoint();
        this.targetPoint = taskWrk.getTargetPoint();
        this.modiUser = taskWrk.getModiUser();
        this.modiTime = taskWrk.getModiTime();
        this.memo = taskWrk.getMemo();
        this.barcode = taskWrk.getBarcode();
        this.assignTime = taskWrk.getAssignTime();
        this.executeTime = taskWrk.getExecuteTime();
        this.completeTime = taskWrk.getCompleteTime();
        this.cancelTime = taskWrk.getCancelTime();
        this.wrkSts = taskWrk.getWrkSts();
        this.crnNo = taskWrk.getCrnNo();
        this.commandStep = taskWrk.getCommandStep();
    }
//    TaskWrkLog taskWrkLog = new TaskWrkLog(
//            null,    // wms任务号
//            null,    // 任务状态
//            null,    // 任务号
//            null,    // 任务时间(接收时间)
//            null,    // 任务类型
//            null,    // 优先级
//            null,    // 起点
//            null,    // 终点
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 备注
//            null,    // 条码
//            null,    // 派发时间
//            null,    // 执行时间
//            null,    // 完结时间
//            null,    // 取消时间
//            null,    // 工作状态
//            null,    // 堆垛机号
//            null,    // 指令执行步序

//    );

    public String getStatus$() {
        if (null == this.status) {
            return null;
        }
        switch (this.status) {
            case 1:
                return "接收";
            case 2:
                return "派发";
            case 3:
                return "步序完成";
            case 4:
                return "取消";
            case 5:
                return "完结";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getIoType$() {
        BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
        BasWrkIotype basWrkIotype = service.selectById(this.ioType);
        if (!Cools.isEmpty(basWrkIotype)) {
            return String.valueOf(basWrkIotype.getIoDesc());
        }
        return null;
    }

    public String getModiUser$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public String getModiTime$() {
        if (Cools.isEmpty(this.modiTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAssignTime$() {
        if (Cools.isEmpty(this.assignTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
    }

    public String getExecuteTime$() {
        if (Cools.isEmpty(this.executeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
    }

    public String getCompleteTime$() {
        if (Cools.isEmpty(this.completeTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
    }

    public String getCancelTime$() {
        if (Cools.isEmpty(this.cancelTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
    }

    public String getWrkSts$() {
        BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
        BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
        if (!Cools.isEmpty(basWrkStatus)) {
            return String.valueOf(basWrkStatus.getWrkDesc());
        }
        return null;
    }


}

 src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java

New file
@@ -0,0 +1,18 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.DevpTask;
import com.zy.asrs.entity.TaskWrk;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Mapper
@Repository
public interface DevpTaskMapper extends BaseMapper<DevpTask> {



}

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -10,10 +10,7 @@
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.wms.StorageEscalationParam;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.StaDescMapper;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.core.CrnThread;
@@ -67,6 +64,9 @@
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private TaskWrkMapper taskWrkMapper;

    @Autowired
    private DevpTaskMapper devpTaskMapper;
    @Autowired
    private TaskWrkService taskWrkService;

@@ -84,9 +84,6 @@

    @Autowired
    private CrnController crnController;

    @Autowired
    private TransferTaskService transferTaskService;


    public void generateStoreWrkFile1() throws IOException, InterruptedException {
@@ -420,6 +417,15 @@
                    if (flag) {
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                .eq("row1", (locMast.getRow1() - 1))
                                .eq("bay1", locMast.getBay1())
                                .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
                        if (!Cools.isEmpty(locMast1)) {
                            log.info(locMast.getLocNo() + "出深库位，浅库位有货");
                            continue;
                        }
                    } else {
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                .eq("row1", (locMast.getRow1() + 1))
                                .eq("bay1", locMast.getBay1())
                                .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
                        if (!Cools.isEmpty(locMast1)) {
@@ -830,9 +836,6 @@
        try {
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                if (devp.getId() == 2) {
                    continue;
                }
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta());
@@ -993,6 +996,71 @@


    /**
     * 独立输送线
     */
    public void onlyDevp() {
        DevpSlave devpSlave = slaveProperties.getDevp().get(1);
        List<DevpSlave.Sta> inSta = devpSlave.getInSta();
        // 获取堆垛机出库站信息
        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
        for (DevpSlave.Sta sta : inSta) {
            try {
                StaProtocol staProtocol = devpThread.getStation().get(sta.getStaNo());
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }
                if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
                    // 查询工作档
//                    TaskWrk taskWrk = devpTaskMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
//                    if (taskWrk == null) {
//                        continue;
//                    }
//                    log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
//                    staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
//                    staProtocol.setStaNo(staDesc.getStnNo().shortValue());
//                    boolean offer = false;
//                    try {
//                        offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
//                    } catch (Exception e) {
//                        log.error("下发输送线任务失败：异常:" + e);
//                        log.error("下发输送线任务失败：异常:offer:" + offer);
//                    }
//                    if (offer) {
//                        log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
//                        taskWrk.setStatus(5);
//                        taskWrk.setWrkSts(14);
//                        taskWrkService.updateById(taskWrk);
//
//                    } else {
//                        log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
//                    }
                }
            } catch (Exception e) {
                log.error("出库到出库站异常:异常信息：" + e);
            }
        }

    }


    /**
     * 跑库程序
     */
    public void debug() {
        //首先库位有一个在库的库位
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F"));
        if (locMast != null) {
            // 再生成一个移库任务
            LocMast mk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O").ne("mk", 1));

        }

    }


    /**
     * 转移任务下发
     */
    public void transferTaskStart() {

 src/main/java/com/zy/core/MainProcess.java

@@ -39,10 +39,12 @@
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;
                    }
                    // 跑库程序
                    //mainService.debug();


                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile1(); // 组托
                    mainService.generateStoreWrkFile(); // 组托
                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn();
                    // 入出库  ===>>  堆垛机入出库作业下发