From aef500a5cebed741c69e2bc3426bc8342db30bf1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 四月 2026 16:10:53 +0800
Subject: [PATCH] #堆垛机命令增加排映射关系V3.0.0.8
---
src/main/java/com/zy/asrs/entity/DeviceDataLog.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
index e49268d..fdeb0da 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
@@ -1,16 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("wcs_device_data_log")
@@ -18,62 +17,60 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁惧绫诲瀷
*/
- @ApiModelProperty(value= "璁惧绫诲瀷")
+ @ApiModelProperty(value = "璁惧绫诲瀷")
private String type;
/**
* 璁惧鍙�
*/
- @ApiModelProperty(value= "璁惧鍙�")
+ @ApiModelProperty(value = "璁惧鍙�")
@TableField("device_no")
private Integer deviceNo;
/**
+ * 绔欑偣鍙�
+ */
+ @ApiModelProperty(value = "绔欑偣鍙�")
+ @TableField("station_id")
+ private Integer stationId;
+
+ /**
* 婧愭暟鎹�
*/
- @ApiModelProperty(value= "婧愭暟鎹�")
+ @ApiModelProperty(value = "婧愭暟鎹�")
@TableField("origin_data")
private String originData;
/**
* 婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁
*/
- @ApiModelProperty(value= "婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁")
+ @ApiModelProperty(value = "婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁")
@TableField("wcs_data")
private String wcsData;
/**
* 閲囬泦鏃堕棿
*/
- @ApiModelProperty(value= "閲囬泦鏃堕棿")
+ @ApiModelProperty(value = "閲囬泦鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- public DeviceDataLog() {}
+ public DeviceDataLog() {
+ }
- public DeviceDataLog(String type,Integer deviceNo,String originData,String wcsData,Date createTime) {
+ public DeviceDataLog(String type, Integer deviceNo, String originData, String wcsData, Date createTime) {
this.type = type;
this.deviceNo = deviceNo;
this.originData = originData;
this.wcsData = wcsData;
this.createTime = createTime;
}
-
-// DeviceDataLog deviceDataLog = new DeviceDataLog(
-// null, // 璁惧绫诲瀷
-// null, // 璁惧鍙�
-// null, // 婧愭暟鎹�
-// null, // 婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁
-// null // 閲囬泦鏃堕棿
-// );
-
-
}
--
Gitblit v1.9.1