*

lsh

2025-04-28 385f2536c06dcf8fec4997fdc3857113afc3df9a

*

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

@@ -14,11 +14,13 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.RgvStatusCache;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,10 @@
    private StaDescService staDescService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private BasRgvErrService basRgvErrService;
    @Autowired
    private BasCrnErrorServiceImpl basCrnErrorService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -64,8 +70,6 @@
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    @Autowired
    private BasCrnErrorServiceImpl basCrnErrorService;

    //agv任务完成
    @PostMapping("/toAgvTaskOver")
@@ -476,7 +480,16 @@
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        List<Object> list = new ArrayList<>();
        for (BasDevp basDevp:basDevps){
            list.add(basDevp);
            BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
            basDevpWmsParam.setDevNo(basDevp.getDevNo());
            basDevpWmsParam.setWrkNo(basDevp.getWrkNo().longValue());
            basDevpWmsParam.setAutoing(basDevp.getAutoing());
            basDevpWmsParam.setLoading(basDevp.getLoading());
            basDevpWmsParam.setInEnable(basDevp.getInEnable());
            basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
            basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
            basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
            list.add(basDevpWmsParam);
        }
        List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
        for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -495,13 +508,34 @@
            basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
            basCrnpWmsParamList.add(basCrnpWmsParam);

            BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
            basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
            try{
                BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
                basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }

            list.add(basCrnpWmsParam);
        }
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
            if (Cools.isEmpty(rgvStatus)){
                continue;
            }
            BasRgvWmsParam basRgvWmsParam = new BasRgvWmsParam();
            basRgvWmsParam.setWrkNo(rgvStatus.getTaskNo());
            basRgvWmsParam.setCrnSts(rgvStatus.getStatus().intValue());
            basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
            basRgvWmsParam.setSteNo(rgvSlave.getId());
            basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
            try{
                BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());

                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            list.add(basRgvWmsParam);
        }
//        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
//        for (BasCrnp basCrnp:basCrnps){

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

@@ -228,7 +228,7 @@

    @ApiModelProperty(value= "异常码")
    @TableField("STA_ERR")
    private Integer staErr;
    private Integer staErr = -1;


    public String getIoTime$(){

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

New file
@@ -0,0 +1,102 @@
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 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("\"SOURCE\".\"asr_bas_rgv_err\"")
public class BasRgvErr implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 异常码
     */
    @ApiModelProperty(value= "异常码")
    @TableId(value = "ERROR_CODE", type = IdType.INPUT)
    @TableField("ERROR_CODE")
    private Long errorCode;

    /**
     * 异常
     */
    @ApiModelProperty(value= "异常")
    @TableField("ERR_NAME")
    private String errName;

    /**
     * 修改人员
     */
    @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= "添加人员")
    @TableField("APPE_USER")
    private Long appeUser;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @TableField("APPE_TIME")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date appeTime;

    public BasRgvErr() {}

    public BasRgvErr(Long errorCode, String errName, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
        this.errorCode = errorCode;
        this.errName = errName;
        this.modiUser = modiUser;
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
    }

//    BasRgvErr basRgvErr = new BasRgvErr(
//            null,    // 异常码[非空]
//            null,    // 异常
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 添加人员
//            null    // 添加时间
//    );

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

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


}

 src/main/java/com/zy/asrs/entity/param/BasDevpWmsParam.java

New file
@@ -0,0 +1,44 @@
package com.zy.asrs.entity.param;
import lombok.Data;

@Data
public class BasDevpWmsParam {

    /**
     * 编号
     */
    private Integer devNo;//输送给站点号

    /**
     * 工作号
     */
    private Long wrkNo;

    /**
     * 异常码
     */
    private Long devErr;//异常码   0：正常
    private String devErrM;//异常   正常
    private String devMk;//备注
    private String inEnable;//可入
    private String outEnable;//可出
    private String autoing;//自动
    private String loading;//有物
    private String barcode = "";//条码
    private Double grossWt;//重量


    public BasDevpWmsParam() {}

    public String getDevErr$() {
        if (devErr == null) return "未知异常";
        switch (devErr.intValue()){
            case 0:
                return "正常";
            case 1:
                return "超重";
            default:
                return "未知异常";
        }
    }
}

 src/main/java/com/zy/asrs/entity/param/BasRgvWmsParam.java

@@ -13,11 +13,12 @@
     * 状态
     */
    private Integer crnSts;
    private String statusType;

    /**
     * 工作号
     */
    private Integer wrkNo;
    private Long wrkNo;

    /**
     * 异常码

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

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

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

@Mapper
@Repository
public interface BasRgvErrMapper extends BaseMapper<BasRgvErr> {

}

 src/main/java/com/zy/asrs/service/BasRgvErrService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasRgvErr;

public interface BasRgvErrService extends IService<BasRgvErr> {

}

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

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvErrService;
import org.springframework.stereotype.Service;

@Service("basRgvErrService")
public class BasRgvErrServiceImpl extends ServiceImpl<BasRgvErrMapper, BasRgvErr> implements BasRgvErrService {

}

 src/main/java/com/zy/core/model/protocol/RgvProtocol.java

@@ -38,7 +38,7 @@
    /**
     * 任务号
     */
    public Short taskNo = 0;
    public Long taskNo = 0L;

    /**
     * 有物

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -492,7 +492,7 @@
//        taskProtocol.setRgvNo(slave.getId());
        Long[] array = new Long[11];
//        array[0] = taskProtocol.getAckFinish1();
        array[1] = taskProtocol.getTaskNo();
//        array[1] = taskProtocol.getTaskNo();
//        array[2] = taskProtocol.getTaskMode();
//        array[4] = command.getDestinationStaNo();
//        array[10] = taskProtocol.getCommand();

 src/main/resources/mapper/BasRgvErrMapper.xml

New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.BasRgvErrMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgvErr">
        <id column="ERROR_CODE" property="errorCode" />
        <result column="ERR_NAME" property="errName" />
        <result column="MODI_USER" property="modiUser" />
        <result column="MODI_TIME" property="modiTime" />
        <result column="APPE_USER" property="appeUser" />
        <result column="APPE_TIME" property="appeTime" />

    </resultMap>

</mapper>