From 18f1c7abcea6f2eca1967141e7b5e408893c31a9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 03 四月 2025 10:39:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 27 +++++++------
src/main/java/com/zy/asrs/entity/BasRgv.java | 29 ++++++++------
src/main/resources/mapper/BasRgvOptMapper.xml | 3 +
src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 33 +++++++++-------
src/main/java/com/zy/asrs/entity/BasRgvMap.java | 16 ++++----
src/main/resources/mapper/WrkMastStaMapper.xml | 1
6 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index 6ce5d92..cc9458e 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -23,77 +23,78 @@
* RGV缂栧彿
*/
@ApiModelProperty(value= "RGV缂栧彿")
- @TableId(value = "rgv_no", type = IdType.INPUT)
- @TableField("rgv_no")
+ @TableId(value = "RGV_NO", type = IdType.INPUT)
+ @TableField("RGV_NO")
private Integer rgvNo;
/**
* 鍙叆
*/
@ApiModelProperty(value= "鍙叆")
- @TableField("in_enable")
+ @TableField("IN_ENABLE")
private String inEnable;
/**
* 鍙嚭
*/
@ApiModelProperty(value= "鍙嚭")
- @TableField("out_enable")
+ @TableField("OUT_ENABLE")
private String outEnable;
/**
* 浣滀笟鎬�
*/
@ApiModelProperty(value= "浣滀笟鎬�")
- @TableField("rgv_sts")
+ @TableField("RGV_STS")
private Integer rgvSts;
/**
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no1")
+ @TableField("WRK_NO1")
private Integer wrkNo1;
/**
* 鍫嗗灈鏈哄彿
*/
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableField("wrk_no2")
+ @TableField("WRK_NO2")
private Integer wrkNo2;
/**
* 閿欒鐮�
*/
@ApiModelProperty(value= "閿欒鐮�")
- @TableField("rgv_err")
+ @TableField("RGV_ERR")
private Long rgvErr;
/**
* 鏍囪
*/
@ApiModelProperty(value= "鏍囪")
- @TableField("pak_mk")
+ @TableField("PAK_MK")
private String pakMk;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @TableField("STATUS")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- @TableField("create_by")
+ @TableField("CREATE_BY")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
+ @TableField("CREATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -101,14 +102,14 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
+ @TableField("UPDATE_BY")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
+ @TableField("UPDATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -116,12 +117,14 @@
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @TableField("MEMO")
private String memo;
/**
* 鏈夌墿鏃犵墿
*/
@ApiModelProperty(value= "鏈夌墿鏃犵墿")
+ @TableField("LOADED2")
private int loaded2;
public BasRgv() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvMap.java b/src/main/java/com/zy/asrs/entity/BasRgvMap.java
index 190dec9..172a9e9 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvMap.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvMap.java
@@ -19,50 +19,50 @@
* RGV缂栧彿
*/
@ApiModelProperty(value= "RGV缂栧彿")
- @TableId(value = "rgv_no", type = IdType.INPUT)
- @TableField("rgv_no")
+ @TableId(value = "RGV_NO", type = IdType.INPUT)
+ @TableField("RGV_NO")
private Integer rgvNo;
/**
* 寮�濮嬭寖鍥�
*/
@ApiModelProperty(value= "寮�濮嬭寖鍥�")
- @TableField("start_route")
+ @TableField("START_ROUTE")
private Integer startRoute;
/**
* 缁撴潫鑼冨洿
*/
@ApiModelProperty(value= "缁撴潫鑼冨洿")
- @TableField("end_route")
+ @TableField("END_ROUTE")
private Integer endRoute;
/**
* 褰撳墠浣嶇疆
*/
@ApiModelProperty(value= "褰撳墠浣嶇疆")
- @TableField("now_route")
+ @TableField("NOW_ROUTE")
private Integer nowRoute;
/**
* 鐘舵��
*/
@ApiModelProperty(value= "鐘舵��")
- @TableField("rgv_status")
+ @TableField("RGV_STATUS")
private Integer rgvStatus;
/**
* 閿�-寮�濮�-浣嶇疆
*/
@ApiModelProperty(value= "閿�-寮�濮�-浣嶇疆")
- @TableField("lock_start_route")
+ @TableField("LOCK_START_ROUTE")
private Integer lockStartRoute;
/**
* 閿�-缁撴潫-浣嶇疆
*/
@ApiModelProperty(value= "閿�-缁撴潫-浣嶇疆")
- @TableField("lock_end_route")
+ @TableField("LOCK_END_ROUTE")
private Integer lockEndRoute;
public BasRgvMap() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
index 6c257a2..7043daa 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
@@ -23,35 +23,35 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "ID", type = IdType.INPUT)
private Long id;
/**
* 浠诲姟鍙�1
*/
@ApiModelProperty(value= "浠诲姟鍙�1")
- @TableField("wrk_no1")
+ @TableField("WRK_NO1")
private Integer wrkNo1;
/**
* 浠诲姟鍙�2
*/
@ApiModelProperty(value= "浠诲姟鍙�2")
- @TableField("wrk_no2")
+ @TableField("WRK_NO2")
private Integer wrkNo2;
/**
* 绌挎杞�
*/
@ApiModelProperty(value= "绌挎杞�")
- @TableField("rgv_no")
+ @TableField("RGV_NO")
private Integer rgvNo;
/**
* 涓嬪彂鏃堕棿
*/
@ApiModelProperty(value= "涓嬪彂鏃堕棿")
- @TableField("send_time")
+ @TableField("SEND_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date sendTime;
@@ -59,75 +59,77 @@
* 浣滀笟
*/
@ApiModelProperty(value= "浣滀笟")
+ @TableField("MODE")
private String mode;
/**
* 婧愭帓
*/
@ApiModelProperty(value= "婧愭帓")
- @TableField("source_row")
+ @TableField("SOURCE_ROW")
private Integer sourceRow;
/**
* 婧愬垪
*/
@ApiModelProperty(value= "婧愬垪")
- @TableField("source_bay")
+ @TableField("SOURCE_BAY")
private Integer sourceBay;
/**
* 婧愬眰
*/
@ApiModelProperty(value= "婧愬眰")
- @TableField("source_lev")
+ @TableField("SOURCE_LEV")
private Integer sourceLev;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta")
+ @TableField("SOURCE_STA")
private Integer sourceSta;
/**
* 鐩爣鎺�
*/
@ApiModelProperty(value= "鐩爣鎺�")
- @TableField("pos_row")
+ @TableField("POS_ROW")
private Integer posRow;
/**
* 鐩爣鍒�
*/
@ApiModelProperty(value= "鐩爣鍒�")
- @TableField("pos_bay")
+ @TableField("POS_BAY")
private Integer posBay;
/**
* 鐩爣灞�
*/
@ApiModelProperty(value= "鐩爣灞�")
- @TableField("pos_lev")
+ @TableField("POS_LEV")
private Integer posLev;
/**
* 鐩爣绔�
*/
@ApiModelProperty(value= "鐩爣绔�")
- @TableField("pos_sta")
+ @TableField("POS_STA")
private Integer posSta;
/**
* 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
*/
@ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
+ @TableField("RESPONSE")
private Integer response;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
+ @TableField("UPDATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -135,13 +137,14 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
+ @TableField("UPDATE_BY")
private Long updateBy;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @TableField("MEMO")
private String memo;
public BasRgvOpt() {}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index a500865..2fdcb25 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -23,49 +23,49 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
+ @TableField("WRK_NO")
private Long wrkNo;
/**
* 宸ヤ綔妗ｅ紑濮嬩綅缃�
*/
@ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
+ @TableField("WRK_START")
private Integer wrkStart;
/**
* 宸ヤ綔妗ｇ粨鏉熶綅缃�
*/
@ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
+ @TableField("WRK_END")
private Integer wrkEnd;
/**
* 灏忚溅鎺ヨ揣浣嶇疆
*/
@ApiModelProperty(value= "灏忚溅鎺ヨ揣浣嶇疆")
- @TableField("sta_start")
+ @TableField("STA_START")
private Integer staStart;
/**
* 灏忚溅鏀捐揣浣嶇疆
*/
@ApiModelProperty(value= "灏忚溅鏀捐揣浣嶇疆")
- @TableField("sta_end")
+ @TableField("STA_END")
private Integer staEnd;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
+ @TableField("CREATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -73,7 +73,7 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
+ @TableField("UPDATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -81,41 +81,42 @@
* 绫诲瀷 0:闈炵┖ 1:绌烘澘
*/
@ApiModelProperty(value= "绫诲瀷 1:婊＄増 2:绌烘澘")
+ @TableField("TYPE")
private Integer type;
/**
* 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
*/
@ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�")
- @TableField("wrk_sts")
+ @TableField("WRK_STS")
private Integer wrkSts;
/**
* 琛屽彿
*/
@ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
+ @TableField("LINE_NUMBER")
private Integer lineNumber;
/**
* 宸ヤ綔绫诲瀷
*/
@ApiModelProperty(value= "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 5锛氭弧鍙� 6锛氭弧鏀�")
- @TableField("wrk_type")
+ @TableField("WRK_TYPE")
private Integer wrkType;
/**
* 宸ヤ綔绫诲瀷
*/
@ApiModelProperty(value= "宸ヤ綔绫诲瀷")
- @TableField("wrk_crn")
+ @TableField("WRK_CRN")
private Integer wrkCrn;
/**
* 鏍囪鏃堕棿
*/
@ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
+ @TableField("BIGN_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date bignTime;
diff --git a/src/main/resources/mapper/BasRgvOptMapper.xml b/src/main/resources/mapper/BasRgvOptMapper.xml
index bc1536d..e92e4b1 100644
--- a/src/main/resources/mapper/BasRgvOptMapper.xml
+++ b/src/main/resources/mapper/BasRgvOptMapper.xml
@@ -5,7 +5,8 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgvOpt">
<result column="ID" property="id" />
- <result column="WRK_NO" property="wrkNo" />
+ <result column="WRK_NO1" property="wrkNo1" />
+ <result column="WRK_NO2" property="wrkNo2" />
<result column="RGV_NO" property="rgvNo" />
<result column="SEND_TIME" property="sendTime" />
<result column="MODE" property="mode" />
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 1672011..a20c84a 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -16,6 +16,7 @@
<result column="WRK_STS" property="wrkSts" />
<result column="LINE_NUMBER" property="lineNumber" />
<result column="WRK_TYPE" property="wrkType" />
+ <result column="WRK_CRN" property="wrkCrn" />
<result column="BIGN_TIME" property="bignTime" />
</resultMap>
--
Gitblit v1.9.1