zyx
2024-04-11 bf28baa00838879c15a22decf314b6e76eb6e89b
输送线扫码时更细站点信息
1个文件已修改
4个文件已添加
366 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/AgvBasDevp.java 309 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/AgvBasDevpService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/BarcodeThread.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/AgvBasDevp.java
New file
@@ -0,0 +1,309 @@
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.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@Data
@TableName("agv_bas_devp")
public class AgvBasDevp implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 编号
     */
    @ApiModelProperty(value= "编号")
    @TableId(value = "dev_no", type = IdType.INPUT)
    @TableField("dev_no")
    private String devNo;
    /**
     * 工作站编码
     */
    @ApiModelProperty(value= "编号")
    @TableId(value = "station_code", type = IdType.INPUT)
    @TableField("station_code")
    private String stationCode;
    /**
     * 设备描述
     */
    @ApiModelProperty(value= "设备描述")
    @TableField("dec_desc")
    private String decDesc;
    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    @TableField("dev_mk")
    private String devMk;
    /**
     * 可入
     */
    @ApiModelProperty(value= "可入")
    @TableField("in_enable")
    private String inEnable;
    /**
     * 可出
     */
    @ApiModelProperty(value= "可出")
    @TableField("out_enable")
    private String outEnable;
    /**
     * 自动
     */
    @ApiModelProperty(value= "自动")
    private String autoing;
    /**
     * 有物
     */
    @ApiModelProperty(value= "有物")
    private String loading;
    /**
     * 能入
     */
    @ApiModelProperty(value= "能入")
    private String canining;
    /**
     * 能出
     */
    @ApiModelProperty(value= "能出")
    private String canouting;
    @ApiModelProperty(value= "")
    private String fronting;
    @ApiModelProperty(value= "")
    private String rearing;
    @ApiModelProperty(value= "")
    private String uping;
    @ApiModelProperty(value= "")
    private String downing;
    /**
     * 需求1
     */
    @ApiModelProperty(value= "货位状态")
    private String locSts;
    /**
     * 是否为缓存货架
     */
    @ApiModelProperty(value= "是否为缓存货架")
    private String cacheShelves;
    /**
     * 工作号
     */
    @ApiModelProperty(value= "工作号")
    @TableField("wrk_no")
    private Integer wrkNo;
    /**
     * 楼
     */
    @ApiModelProperty(value= "楼")
    @TableField("floor")
    private Integer floor;
    /**
     * 容器类型
     */
    @ApiModelProperty(value= "容器类型")
    @TableField("ctn_type")
    private Integer ctnType;
    /**
     * 条形码
     */
    @ApiModelProperty(value= "条形码")
    private String barcode;
    @ApiModelProperty(value= "")
    @TableField("in_qty")
    private Integer inQty;
    @ApiModelProperty(value= "")
    private Integer row1;
    @ApiModelProperty(value= "")
    @TableField("io_time")
    private Date ioTime;
    @ApiModelProperty(value= "")
    private String area;
    @ApiModelProperty(value= "")
    @TableField("in_ok")
    private String inOk;
    @ApiModelProperty(value= "")
    @TableField("out_ok")
    private String outOk;
    @ApiModelProperty(value= "高低类型{0:未知,1:低库位,2:高库位}")
    @TableField("loc_type1")
    private Short locType1;
    @ApiModelProperty(value= "宽窄类型{0:未知,1:窄库位,2:宽库位}")
    @TableField("loc_type2")
    private Short locType2;
    @ApiModelProperty(value= "轻重类型{0:未知,1:轻库位,2:重库位}")
    @TableField("loc_type3")
    private Short locType3;
    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    @TableField("modi_user")
    private Long modiUser;
    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @TableField("modi_time")
    private Date modiTime;
    /**
     * 创建者
     */
    @ApiModelProperty(value= "创建者")
    @TableField("appe_user")
    private Long appeUser;
    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @TableField("appe_time")
    private Date appeTime;
    @ApiModelProperty(value= "")
    @TableField("std_qty")
    private Double stdQty;
    @ApiModelProperty(value= "")
    @TableField("min_wt")
    private Double minWt;
    @ApiModelProperty(value= "")
    @TableField("max_wt")
    private Double maxWt;
    /**
     * 重量
     */
    @ApiModelProperty(value= "重量")
    @TableField("gross_wt")
    private Double grossWt;
    @ApiModelProperty(value= "")
    @TableField("cart_pos")
    private Integer cartPos;
    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
    }
    public String getLocType1$() {
        if (null == this.locType1){ return null; }
        switch (this.locType1){
            case 0:
                return "未知";
            case 1:
                return "低库位";
            case 2:
                return "高库位";
            default:
                return String.valueOf(this.locType1);
        }
    }
    public String getLocType2$() {
        if (null == this.locType2){ return null; }
        switch (this.locType2){
            case 0:
                return "未知";
            case 1:
                return "窄库位";
            case 2:
                return "宽库位";
            default:
                return String.valueOf(this.locType2);
        }
    }
    public String getLocType3$() {
        if (null == this.locType3){ return null; }
        switch (this.locType3){
            case 0:
                return "未知";
            case 1:
                return "轻库位";
            case 2:
                return "重库位";
            default:
                return String.valueOf(this.locType3);
        }
    }
    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 getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }
    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/mapper/AgvBasDevpMapper.java
New file
@@ -0,0 +1,17 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.AgvBasDevp;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@Mapper
@Repository
public interface AgvBasDevpMapper extends BaseMapper<AgvBasDevp> {
    @Update("update agv_bas_devp set barcode = #{barcode} where dev_no = #{devNo}")
    public void updateBarcode(@Param("devNo") String devNo, @Param("barcode") String barcode);
}
src/main/java/com/zy/asrs/service/AgvBasDevpService.java
New file
@@ -0,0 +1,13 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.AgvBasDevp;
import java.util.List;
import java.util.Map;
public interface AgvBasDevpService extends IService<AgvBasDevp> {
    void updateBarcode(String devNo, String barcode);
}
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
New file
@@ -0,0 +1,16 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.mapper.AgvBasDevpMapper;
import com.zy.asrs.service.AgvBasDevpService;
import org.springframework.stereotype.Service;
@Service
public class AgvBasDevpServiceImpl extends ServiceImpl<AgvBasDevpMapper, AgvBasDevp> implements AgvBasDevpService {
    @Override
    public void updateBarcode(String devNo, String barcode) {
        this.baseMapper.updateBarcode(devNo,barcode);
    }
}
src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -3,12 +3,14 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.core.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -34,6 +36,9 @@
    private DataInputStream dataInputStream;
    public Integer connCount = 0;
    @Autowired
    private AgvBasDevpService agvBasDevpService;
    public BarcodeThread(Slave slave) {
        this.slave = slave;
    }
@@ -47,6 +52,7 @@
        this.barcode.append(barcode);
        if(!Cools.isEmpty(barcode)) {
            News.info("{}号条码器,检索数据:{}", slave.getId(), this.barcode);
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
            jsonObject.put("barcode", barcode);
@@ -55,6 +61,11 @@
                OutputQueue.BARCODE.poll();
            }
            OutputQueue.BARCODE.offer(jsonObject);
            String devNo = slave.getId() == 13 ? "310-1" : slave.getId() == 15 ? "312-2" : slave.getId() == 17 ? "314-1" : slave.getId() == 19 ? "316-1" : null;
            if(!Cools.isEmpty(devNo)){
                agvBasDevpService.updateBarcode(devNo,barcode);
            }
        }
    }