#设备命令下发增加设备工作号

Junjie

2023-10-05 4b0095b48747072f6c1f427a52ec4b73dca0cc75

#设备命令下发增加设备工作号

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

@@ -83,6 +83,13 @@
    @TableField("system_status")
    private String systemStatus;

    /**
     * 设备工作号
     */
    @ApiModelProperty(value= "设备工作号")
    @TableField("device_wrk")
    private String deviceWrk;

    public BasLiftOpt() {}

    public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {

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

@@ -123,6 +123,13 @@
    @TableField("response")
    private String response;

    /**
     * 设备工作号
     */
    @ApiModelProperty(value= "设备工作号")
    @TableField("device_wrk")
    private String deviceWrk;

    public BasShuttleOpt() {}

    public BasShuttleOpt(Integer wrkNo, Integer shuttleNo, Date sendTime, String mode, String sourceLocNo, String distLocNo, Date updateTime, Long updateBy, String memo, String command, String commandSend, String systemStatus) {

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

@@ -381,6 +381,7 @@
                    JSON.toJSONString(command),
                    JSON.toJSONString(liftProtocol)
            );
            opt.setDeviceWrk(command.getTaskNo().toString());//设备工作号
            liftOptService.insert(opt);
        }


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

@@ -336,6 +336,7 @@
            );
            opt.setSend(1);//已下发
            opt.setResponse(JSON.toJSONString(result));//请求响应
            opt.setDeviceWrk(command.getWrkNo().toString());//设备工作号
            shuttleOptService.insert(opt);
        }


 src/main/resources/mapper/BasLiftOptMapper.xml

@@ -13,6 +13,7 @@
        <result column="memo" property="memo" />
        <result column="command" property="command" />
        <result column="system_status" property="systemStatus" />
        <result column="device_wrk" property="deviceWrk" />

    </resultMap>


 src/main/resources/mapper/BasShuttleOptMapper.xml

@@ -18,6 +18,7 @@
        <result column="system_status" property="systemStatus" />
        <result column="send" property="send" />
        <result column="response" property="response" />
        <result column="device_wrk" property="deviceWrk" />

    </resultMap>