From 462bd7db50d8215154a860def7470563ae213913 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 02 四月 2025 16:13:56 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/CommandInfoLog.java | 26
src/main/java/com/zy/asrs/entity/BasDevp.java | 71 ++--
src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java | 36 +-
src/main/java/com/zy/asrs/entity/MatCode.java | 5
src/main/java/com/zy/asrs/entity/BasCrnError.java | 12
src/main/java/com/zy/asrs/entity/BasPlcerror.java | 14
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 14
src/main/resources/application-prod.yml | 492 +++-----------------------------
src/main/java/com/zy/asrs/entity/RowLastno.java | 25
src/main/java/com/zy/asrs/entity/ApiLog.java | 30 +-
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 16
src/main/java/com/zy/asrs/entity/LocDetl.java | 2
src/main/java/com/zy/asrs/entity/CommandInfo.java | 23
src/main/java/com/zy/asrs/entity/DeviceError.java | 9
src/main/java/com/zy/asrs/entity/DataResource.java | 9
src/main/java/com/zy/asrs/entity/LocMast.java | 6
src/main/resources/mapper/BasDevpMapper.xml | 2
src/main/java/com/zy/asrs/entity/BasLocSts.java | 14
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 12
src/main/java/com/zy/asrs/entity/StaDesc.java | 31 +-
20 files changed, 244 insertions(+), 605 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index 12f8ca1..7d99d2e 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -24,91 +24,91 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "\"id\"", type = IdType.AUTO)
+ @TableId(value = "\"ID\"", type = IdType.AUTO)
private Long id;
/**
* 鏃ュ織缂栧彿
*/
@ApiModelProperty(value= "鏃ュ織缂栧彿")
- @TableField("\"uuid\"")
+ @TableField("\"UUID\"")
private String uuid;
/**
* 鍚嶇О绌洪棿
*/
@ApiModelProperty(value= "鍚嶇О绌洪棿")
- @TableField("\"namespace\"")
+ @TableField("\"NAMESPACE\"")
private String namespace;
/**
* 鎺ュ彛鍦板潃
*/
@ApiModelProperty(value= "鎺ュ彛鍦板潃")
- @TableField("\"url\"")
+ @TableField("\"URL\"")
private String url;
/**
* 骞冲彴瀵嗛挜
*/
@ApiModelProperty(value= "骞冲彴瀵嗛挜")
- @TableField("\"appkey\"")
+ @TableField("\"APPKEY\"")
private String appkey;
/**
* 鏃堕棿鎴�
*/
@ApiModelProperty(value= "鏃堕棿鎴�")
- @TableField("\"timestamp\"")
+ @TableField("\"TIMESTAMP\"")
private String timestamp;
/**
* 瀹㈡埛绔疘P
*/
@ApiModelProperty(value= "瀹㈡埛绔疘P")
- @TableField("\"clientIp\"")
+ @TableField("\"CLIENT_IP\"")
private String clientIp;
/**
* 璇锋眰鍐呭
*/
@ApiModelProperty(value= "璇锋眰鍐呭")
- @TableField("\"request\"")
+ @TableField("\"REQUEST\"")
private String request;
/**
* 鍝嶅簲鍐呭
*/
@ApiModelProperty(value= "鍝嶅簲鍐呭")
- @TableField("\"response\"")
+ @TableField("\"RESPONSE\"")
private String response;
/**
* 寮傚父鍐呭
*/
@ApiModelProperty(value= "寮傚父鍐呭")
- @TableField("\"err\"")
+ @TableField("\"ERR\"")
private String err;
/**
* 缁撴灉 1: 鎴愬姛 0: 澶辫触
*/
@ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
- @TableField("\"result\"")
+ @TableField("\"RESULT\"")
private Integer result;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- @TableField("\"status\"")
+ @TableField("\"STATUS\"")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("\"createTime\"")
+ @TableField("\"CREATE_TIME\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -116,7 +116,7 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("\"updateTime\"")
+ @TableField("\"UPDATE_TIME\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -124,7 +124,7 @@
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
- @TableField("\"memo\"")
+ @TableField("\"MEMO\"")
private String memo;
public ApiLog() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index 830e9c6..3df3962 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -23,42 +23,42 @@
* 寮傚父浠ｅ彿
*/
@ApiModelProperty(value= "寮傚父浠ｅ彿")
- @TableId(value = "\"errorCode\"", type = IdType.AUTO)
+ @TableId(value = "\"ERROR_CODE\"", type = IdType.AUTO)
private Long errorCode;
/**
* 寮傚父鎻忚堪
*/
@ApiModelProperty(value= "寮傚父鎻忚堪")
- @TableField("\"err_name\"")
+ @TableField("\"ERR_NAME\"")
private String errName;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("\"modi_user\"")
+ @TableField("\"MODI_USER\"")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("\"modi_time\"")
+ @TableField("\"MODI_TIME\"")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("\"appe_user\"")
+ @TableField("\"APPE_USER\"")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("\"appe_time\"")
+ @TableField("\"APPE_TIME\"")
private Date appeTime;
public BasCrnError() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index b976bbc..08eec63 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -23,42 +23,42 @@
* 宸ヤ綔浠ｅ彿
*/
@ApiModelProperty(value= "鐘舵�佷唬鍙�")
- @TableId(value = "\"sts_no\"", type = IdType.INPUT)
+ @TableId(value = "\"STS_NO\"", type = IdType.INPUT)
private String stsNo;
/**
* 鐘舵�佹弿杩�
*/
@ApiModelProperty(value= "鐘舵�佹弿杩�")
- @TableField("\"sts_desc\"")
+ @TableField("\"STS_DESC\"")
private String stsDesc;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("\"modi_user\"")
+ @TableField("\"MODI_USER\"")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("\"modi_time\"")
+ @TableField("\"MODI_TIME\"")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("\"appe_user\"")
+ @TableField("\"APPE_USER\"")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("\"appe_time\"")
+ @TableField("\"APPE_TIME\"")
private Date appeTime;
public BasCrnStatus() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 99fca6f..38036d5 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -25,204 +25,209 @@
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
- @TableId(value = "\"dev_no\"", type = IdType.INPUT)
+ @TableId(value = "\"DEV_NO\"", type = IdType.INPUT)
private Integer devNo;
/**
* 璁惧鎻忚堪
*/
@ApiModelProperty(value= "璁惧鎻忚堪")
- @TableField("\"dec_desc\"")
+ @TableField("\"DEC_DESC\"")
private String decDesc;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
- @TableField("\"dev_mk\"")
+ @TableField("\"DEV_MK\"")
private String devMk;
/**
* 鍙叆
*/
@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("\"autoing\"")
+ @TableField("\"AUTOING\"")
private String autoing;
/**
* 鏈夌墿
*/
@ApiModelProperty(value= "鏈夌墿")
- @TableField("\"loading\"")
+ @TableField("\"LOADING\"")
private String loading;
/**
* 鑳藉叆
*/
@ApiModelProperty(value= "鑳藉叆")
- @TableField("\"canining\"")
+ @TableField("\"CANINING\"")
private String canining;
/**
* 鑳藉嚭
*/
@ApiModelProperty(value= "鑳藉嚭")
- @TableField("\"canouting\"")
+ @TableField("\"CANOUTING\"")
private String canouting;
@ApiModelProperty(value= "")
- @TableField("\"fronting\"")
+ @TableField("\"FRONTING\"")
private String fronting;
@ApiModelProperty(value= "")
- @TableField("\"rearing\"")
+ @TableField("\"REARING\"")
private String rearing;
@ApiModelProperty(value= "")
- @TableField("\"uping\"")
+ @TableField("\"UPING\"")
private String uping;
@ApiModelProperty(value= "")
- @TableField("\"downing\"")
+ @TableField("\"DOWNING\"")
private String downing;
/**
* 闇�姹�1
*/
@ApiModelProperty(value= "闇�姹�1")
+ @TableField("\"INREQ1\"")
private String inreq1;
/**
* 闇�姹�2
*/
@ApiModelProperty(value= "闇�姹�2")
+ @TableField("\"INREQ2\"")
private String inreq2;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
+ @TableField("WRK_NO")
private Integer wrkNo;
@ApiModelProperty(value= "")
- @TableField("wrk_no1")
+ @TableField("WRK_NO1")
private Integer wrkNo1;
/**
* 瀹瑰櫒绫诲瀷
*/
@ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
- @TableField("ctn_type")
+ @TableField("CTN_TYPE")
private Integer ctnType;
/**
* 鏉″舰鐮�
*/
@ApiModelProperty(value= "鏉″舰鐮�")
+ @TableField("BARCODE")
private String barcode;
@ApiModelProperty(value= "鍏ュ簱鏆傚瓨鏁�")
- @TableField("in_qty")
+ @TableField("IN_QTY")
private Integer inQty;
@ApiModelProperty(value= "")
+ @TableField("ROW1")
private Integer row1;
@ApiModelProperty(value= "")
- @TableField("io_time")
+ @TableField("IO_TIME")
private Date ioTime;
@ApiModelProperty(value= "")
+ @TableField("AREA")
private String area;
@ApiModelProperty(value= "")
- @TableField("in_ok")
+ @TableField("IN_OK")
private String inOk;
@ApiModelProperty(value= "")
- @TableField("out_ok")
+ @TableField("OUT_OK")
private String outOk;
@ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
- @TableField("loc_type1")
+ @TableField("LOC_TYPE1")
private Short locType1;
@ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
- @TableField("loc_type2")
+ @TableField("LOC_TYPE2")
private Short locType2;
@ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
- @TableField("loc_type3")
+ @TableField("LOC_TYPE3")
private Short locType3;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
@ApiModelProperty(value= "")
- @TableField("std_qty")
+ @TableField("STD_QTY")
private Double stdQty;
@ApiModelProperty(value= "")
- @TableField("min_wt")
+ @TableField("MIN_WT")
private Double minWt;
@ApiModelProperty(value= "")
- @TableField("max_wt")
+ @TableField("MAX_WT")
private Double maxWt;
/**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
- @TableField("gross_wt")
+ @TableField("GROSS_WT")
private Double grossWt;
@ApiModelProperty(value= "")
- @TableField("cart_pos")
+ @TableField("CART_POS")
private Integer cartPos;
@ApiModelProperty(value= "寮傚父鐮�")
- @TableField("sta_err")
+ @TableField("STA_ERR")
private Integer staErr;
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index f6a5fb2..a1ec242 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -23,43 +23,43 @@
* 搴撲綅鐘舵�佷唬鍙�
*/
@ApiModelProperty(value= "搴撲綅鐘舵�佷唬鍙�")
- @TableId(value = "loc_sts", type = IdType.INPUT)
- @TableField("loc_sts")
+ @TableId(value = "LOC_STS", type = IdType.INPUT)
+ @TableField("LOC_STS")
private String locSts;
/**
* 搴撲綅鐘舵�佹弿杩�
*/
@ApiModelProperty(value= "搴撲綅鐘舵�佹弿杩�")
- @TableField("loc_desc")
+ @TableField("LOC_DESC")
private String locDesc;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
public BasLocSts() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
index 079724f..5a6485a 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -23,43 +23,43 @@
* 寮傚父缂栧彿
*/
@ApiModelProperty(value= "寮傚父缂栧彿")
- @TableId(value = "error_code", type = IdType.INPUT)
- @TableField("error_code")
+ @TableId(value = "ERROR_CODE", type = IdType.INPUT)
+ @TableField("ERROR_CODE")
private Integer errorCode;
/**
* 寮傚父鎻忚堪
*/
@ApiModelProperty(value= "寮傚父鎻忚堪")
- @TableField("error_desc")
+ @TableField("ERROR_DESC")
private String errorDesc;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
public BasPlcerror() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
index 27f3ecb..430e291 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
@@ -37,21 +37,21 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
+ @TableField("WRK_NO")
private Integer wrkNo;
/**
* 寮�濮嬫椂闂�
*/
@ApiModelProperty(value= "寮�濮嬫椂闂�")
- @TableField("start_time")
+ @TableField("START_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@@ -59,7 +59,7 @@
* 缁撴潫鏃堕棿
*/
@ApiModelProperty(value= "缁撴潫鏃堕棿")
- @TableField("end_time")
+ @TableField("END_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@@ -67,81 +67,84 @@
* 宸ヤ綔鐘舵��
*/
@ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
+ @TableField("WRK_STS")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableField("io_type")
+ @TableField("IO_TYPE")
private Integer ioType;
/**
* plc
*/
@ApiModelProperty(value= "plc")
- @TableField("plc_no")
+ @TableField("PLC_NO")
private Integer plcNo;
/**
* 鐩爣搴撲綅
*/
@ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("loc_no")
+ @TableField("LOC_NO")
private String locNo;
/**
* 鐩爣绔�
*/
@ApiModelProperty(value= "鐩爣绔�")
- @TableField("sta_no")
+ @TableField("STA_NO")
private Integer staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta_no")
+ @TableField("SOURCE_STA_NO")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
@ApiModelProperty(value= "婧愬簱浣�")
- @TableField("source_loc_no")
+ @TableField("SOURCE_LOC_NO")
private String sourceLocNo;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉＄爜")
+ @TableField("BARCODE")
private String barcode;
/**
* 寮傚父缂栧彿
*/
@ApiModelProperty(value= "寮傚父缂栧彿")
- @TableField("err_code")
+ @TableField("ERR_CODE")
private Integer errCode;
/**
* 寮傚父鎻忚堪
*/
@ApiModelProperty(value= "寮傚父鎻忚堪")
+ @TableField("ERR")
private String err;
/**
* 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
@ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
+ @TableField("STATUS")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
+ @TableField("CREATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -149,14 +152,14 @@
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- @TableField("create_by")
+ @TableField("CREATE_BY")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
+ @TableField("UPDATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -164,13 +167,14 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
+ @TableField("UPDATE_BY")
private Long updateBy;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @TableField("MEMO")
private String memo;
public BasPlcerrorLog() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index 13a5ec6..0ae9e3c 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -23,50 +23,50 @@
* 鍏ュ嚭绫诲瀷浠ｅ彿
*/
@ApiModelProperty(value= "鍏ュ嚭绫诲瀷浠ｅ彿")
- @TableId(value = "io_type", type = IdType.INPUT)
- @TableField("io_type")
+ @TableId(value = "IO_TYPE", type = IdType.INPUT)
+ @TableField("IO_TYPE")
private Integer ioType;
/**
* 涓昏
*/
@ApiModelProperty(value= "涓昏")
- @TableField("io_pri")
+ @TableField("IO_PRI")
private String ioPri;
/**
* 鍏ュ嚭绫诲瀷鎻忚堪
*/
@ApiModelProperty(value= "鍏ュ嚭绫诲瀷鎻忚堪")
- @TableField("io_desc")
+ @TableField("IO_DESC")
private String ioDesc;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
public BasWrkIotype() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index 726387e..11a55fa 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -23,43 +23,43 @@
* 浠ｅ彿
*/
@ApiModelProperty(value= "浠ｅ彿")
- @TableId(value = "wrk_sts", type = IdType.INPUT)
- @TableField("wrk_sts")
+ @TableId(value = "WRK_STS", type = IdType.INPUT)
+ @TableField("WRK_STS")
private Long wrkSts;
/**
* 鐘舵�佹弿杩�
*/
@ApiModelProperty(value= "鐘舵�佹弿杩�")
- @TableField("wrk_desc")
+ @TableField("WRK_DESC")
private String wrkDesc;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
public BasWrkStatus() {}
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index e453846..5bd8cd6 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -21,35 +21,35 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Integer id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
+ @TableField("WRK_NO")
private Integer wrkNo;
/**
* WMS浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("task_no")
+ @TableField("TASK_NO")
private String taskNo;
/**
* 鎸囦护绫诲瀷{1:鍒涘缓,2:鎵ц,3:瀹屾垚}
*/
@ApiModelProperty(value= "鎸囦护鐘舵��")
- @TableField("command_status")
+ @TableField("COMMAND_STATUS")
private Integer commandStatus;
/**
* 寮�濮嬫椂闂�
*/
@ApiModelProperty(value= "寮�濮嬫椂闂�")
- @TableField("start_time")
+ @TableField("START_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@@ -57,41 +57,42 @@
* 鎸囦护绫诲瀷
*/
@ApiModelProperty(value= "鎸囦护绫诲瀷")
- @TableField("command_type")
+ @TableField("COMMAND_TYPE")
private Integer commandType;
/**
* 璁惧
*/
@ApiModelProperty(value= "璁惧")
+ @TableField("DEVICE")
private String device;
/**
* 璁惧鎵ц淇℃伅
*/
@ApiModelProperty(value= "璁惧鎵ц淇℃伅")
- @TableField("device_log")
+ @TableField("DEVICE_LOG")
private String deviceLog;
/**
* 鍛戒护鎻忚堪
*/
@ApiModelProperty(value= "鍛戒护鎻忚堪")
- @TableField("command_desc")
+ @TableField("COMMAND_DESC")
private String commandDesc;
/**
* 鍛戒护JSON
*/
@ApiModelProperty(value= "鍛戒护JSON")
- @TableField("command")
+ @TableField("COMMAND")
private String command;
/**
* 鎵ц鏃堕棿
*/
@ApiModelProperty(value= "鎵ц鏃堕棿")
- @TableField("execute_time")
+ @TableField("EXECUTE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date executeTime;
@@ -99,7 +100,7 @@
* 瀹屾垚鏃堕棿
*/
@ApiModelProperty(value= "瀹屾垚鏃堕棿")
- @TableField("complete_time")
+ @TableField("COMPLETE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date completeTime;
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index d08e69c..231285f 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
@@ -25,42 +25,42 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Integer id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
+ @TableField("WRK_NO")
private Integer wrkNo;
/**
* 璧风偣浣嶇疆
*/
@ApiModelProperty(value= "璧风偣浣嶇疆")
- @TableField("start_pos")
+ @TableField("START_POS")
private String startPos;
/**
* 缁堢偣浣嶇疆
*/
@ApiModelProperty(value= "缁堢偣浣嶇疆")
- @TableField("end_pos")
+ @TableField("END_POS")
private String endPos;
/**
* 鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚
*/
@ApiModelProperty(value= "鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚 ")
- @TableField("command_status")
+ @TableField("COMMAND_STATUS")
private Integer commandStatus;
/**
* 鍒涘缓鏃堕棿
*/
@ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("start_time")
+ @TableField("START_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@@ -68,47 +68,49 @@
* 鎸囦护绫诲瀷
*/
@ApiModelProperty(value= "鎸囦护绫诲瀷")
- @TableField("command_type")
+ @TableField("COMMAND_TYPE")
private Integer commandType;
/**
* 璁惧
*/
@ApiModelProperty(value= "璁惧")
+ @TableField("DEVICE")
private String device;
/**
* 璁惧鎵ц淇℃伅
*/
@ApiModelProperty(value= "璁惧鎵ц淇℃伅")
- @TableField("device_log")
+ @TableField("DEVICE_LOG")
private String deviceLog;
/**
* 鍛戒护鎻忚堪
*/
@ApiModelProperty(value= "鍛戒护鎻忚堪")
- @TableField("command_desc")
+ @TableField("COMMAND_DESC")
private String commandDesc;
/**
* 鍛戒护JSON
*/
@ApiModelProperty(value= "鍛戒护JSON")
+ @TableField("COMMAND")
private String command;
/**
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("task_no")
+ @TableField("TASK_NO")
private String taskNo;
/**
* 鎵ц鏃堕棿
*/
@ApiModelProperty(value= "鎵ц鏃堕棿")
- @TableField("execute_time")
+ @TableField("EXECUTE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date executeTime;
@@ -116,7 +118,7 @@
* 瀹屾垚鏃堕棿
*/
@ApiModelProperty(value= "瀹屾垚鏃堕棿")
- @TableField("complete_time")
+ @TableField("COMPLETE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date completeTime;
diff --git a/src/main/java/com/zy/asrs/entity/DataResource.java b/src/main/java/com/zy/asrs/entity/DataResource.java
index 697e826..f730c18 100644
--- a/src/main/java/com/zy/asrs/entity/DataResource.java
+++ b/src/main/java/com/zy/asrs/entity/DataResource.java
@@ -19,25 +19,28 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value= "")
+ @TableField("DATA")
private String data;
@ApiModelProperty(value= "")
+ @TableField("NAME")
private String name;
@ApiModelProperty(value= "")
- @TableField("resource_id")
+ @TableField("RESOURCE_ID")
private Integer resourceId;
@ApiModelProperty(value= "")
- @TableField("create_time")
+ @TableField("CREATE_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value= "澶囨敞")
+ @TableField("MEMO")
private String memo;
public DataResource() {}
diff --git a/src/main/java/com/zy/asrs/entity/DeviceError.java b/src/main/java/com/zy/asrs/entity/DeviceError.java
index 0a4de49..7e5d140 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceError.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -19,28 +19,28 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "\"id\"", type = IdType.AUTO)
+ @TableId(value = "\"ID\"", type = IdType.AUTO)
private Long id;
/**
* 璁惧
*/
@ApiModelProperty(value= "璁惧")
- @TableField("\"device\"")
+ @TableField("\"DEVICE\"")
private String device;
/**
* 璁惧ID
*/
@ApiModelProperty(value= "璁惧ID")
- @TableField("\"device_id\"")
+ @TableField("\"DEVICE_ID\"")
private Integer deviceId;
/**
* 鍒涘缓鏃堕棿
*/
@ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("\"create_time\"")
+ @TableField("\"CREATE_TIME\"")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -48,6 +48,7 @@
* 寮傚父淇℃伅
*/
@ApiModelProperty(value= "寮傚父淇℃伅")
+ @TableField("\"MSG\"")
private String msg;
public DeviceError() {}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index beeafce..538d7b1 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -22,7 +22,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("loc_no")
+ @TableField("LOC_NO")
private String locNo;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 140a012..60dfb6e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -26,15 +26,15 @@
* 搴撲綅鍙�
*/
@ApiModelProperty(value= "搴撲綅鍙�")
- @TableId(value = "loc_no", type = IdType.INPUT)
- @TableField("loc_no")
+ @TableId(value = "LOC_NO", type = IdType.INPUT)
+ @TableField("LOC_NO")
private String locNo;
/**
* 搴撲綅绫诲瀷
*/
@ApiModelProperty(value= "搴撲綅绫诲瀷")
- @TableField("whs_type")
+ @TableField("WHS_TYPE")
private Long whsType;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 17438b0..f2d3b6f 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -23,14 +23,15 @@
* 鍟嗗搧缂栧彿
*/
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @TableId(value = "mat_no", type = IdType.INPUT)
- @TableField("mat_no")
+ @TableId(value = "MAT_NO", type = IdType.INPUT)
+ @TableField("MAT_NO")
private String matNo;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉″舰鐮�")
+ @TableField("BARCODE")
private String barcode;
/**
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 33a7d05..268b522 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -23,81 +23,82 @@
* 绫诲埆
*/
@ApiModelProperty(value= "绫诲埆")
- @TableId(value = "whs_type", type = IdType.INPUT)
- @TableField("whs_type")
+ @TableId(value = "WHS_TYPE", type = IdType.INPUT)
+ @TableField("WHS_TYPE")
private Integer whsType;
/**
* 褰撳墠宸ヤ綔鍙�
*/
@ApiModelProperty(value= "褰撳墠宸ヤ綔鍙�")
- @TableField("wrk_mk")
+ @TableField("WRK_MK")
private String wrkMk;
/**
* 褰撳墠鎺掑彿
*/
@ApiModelProperty(value= "褰撳墠鎺掑彿")
- @TableField("current_row")
+ @TableField("CURRENT_ROW")
private Integer currentRow;
/**
* 璧峰鎺掑彿
*/
@ApiModelProperty(value= "璧峰鎺掑彿")
- @TableField("s_row")
+ @TableField("S_ROW")
private Integer sRow;
/**
* 缁堟鎺掑彿
*/
@ApiModelProperty(value= "缁堟鎺掑彿")
- @TableField("e_row")
+ @TableField("E_ROW")
private Integer eRow;
/**
* 鍫嗗灈鏈烘暟閲�
*/
@ApiModelProperty(value= "鍫嗗灈鏈烘暟閲�")
- @TableField("crn_qty")
+ @TableField("CRN_QTY")
private Integer crnQty;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @TableField("MEMO")
private String memo;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
@ApiModelProperty(value= "")
- @TableField("limint_loc")
+ @TableField("LIMINT_LOC")
private Integer limintLoc;
public RowLastno() {}
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index c6e0a06..c6b4a61 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -26,87 +26,88 @@
* 璺緞ID
*/
@ApiModelProperty(value= "璺緞ID")
- @TableId(value = "type_id", type = IdType.AUTO)
- @TableField("type_id")
+ @TableId(value = "TYPE_ID", type = IdType.AUTO)
+ @TableField("TYPE_ID")
private Long typeId;
/**
* 鍏ュ嚭搴撶被鍨�
*/
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableId(value = "type_no", type = IdType.INPUT)
- @TableField("type_no")
+ @TableId(value = "TYPE_NO", type = IdType.INPUT)
+ @TableField("TYPE_NO")
private Integer typeNo;
/**
* 浣滀笟绫诲瀷
*/
@ApiModelProperty(value= "浣滀笟绫诲瀷")
- @TableField("type_desc")
+ @TableField("TYPE_DESC")
private String typeDesc;
/**
* 浣滀笟绔欑偣
*/
@ApiModelProperty(value= "浣滀笟绔欑偣")
- @TableId(value = "stn_no", type = IdType.INPUT)
- @TableField("stn_no")
+ @TableId(value = "STN_NO", type = IdType.INPUT)
+ @TableField("STN_NO")
private Integer stnNo;
/**
* 绔欑偣鍚嶇О
*/
@ApiModelProperty(value= "绔欑偣鍚嶇О")
- @TableField("stn_desc")
+ @TableField("STN_DESC")
private String stnDesc;
/**
* 鍫嗗灈鏈哄彿
*/
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableId(value = "crn_no", type = IdType.INPUT)
- @TableField("crn_no")
+ @TableId(value = "CRN_NO", type = IdType.INPUT)
+ @TableField("CRN_NO")
private Integer crnNo;
/**
* 鍫嗗灈鏈虹珯鐐�
*/
@ApiModelProperty(value= "鍫嗗灈鏈虹珯鐐�")
- @TableField("crn_stn")
+ @TableField("CRN_STN")
private Integer crnStn;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @TableField("MEMO")
private String memo;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
+ @TableField("MODI_USER")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("MODI_TIME")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
+ @TableField("APPE_USER")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("APPE_TIME")
private Date appeTime;
public StaDesc() {}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 647e2de..4299c61 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -12,7 +12,7 @@
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- ip: 192.168.1.100
+ ip: 192.168.4.250
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
staNo: 100
row: 1
@@ -32,7 +32,7 @@
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- ip: 192.168.1.110
+ ip: 192.168.4.250
crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
staNo: 102
row: 4
@@ -42,20 +42,62 @@
id: 2
slot: 0
demo: false
- barcode[3]: #鏉＄爜鎵弿浠�4
- port: 51236
- ip: 10.10.10.52
- id: 4
- barcode[2]: #鏉＄爜鎵弿浠�3
- port: 51236
- ip: 10.10.10.52
+ crn[2]: #鍫嗗灈鏈�3
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 105
+ row: 9
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 192.168.4.250
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 104
+ row: 8
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
id: 3
-
+ slot: 0
+ demo: false
+ crn[3]: #鍫嗗灈鏈�4
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 107
+ row: 12
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 192.168.4.250
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 106
+ row: 11
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ id: 4
+ slot: 0
+ demo: false
+ barcode[0]: #鏉＄爜鎵弿浠�1
+ port: 51236
+ ip: 10.10.10.52
+ id: 1
barcode[1]: #鏉＄爜鎵弿浠�2
port: 51236
- ip: 10.10.10.52
+ ip: 192.168.4.250
id: 2
-
+ barcode[2]: #鏉＄爜鎵弿浠�3
+ port: 51236
+ ip: 192.168.4.250
+ id: 3
+ barcode[3]: #鏉＄爜鎵弿浠�4
+ port: 51236
+ ip: 192.168.4.250
+ id: 4
devp[0]: #杈撻�佺嚎
emptyInSta[2]: #绌烘澘鍏ュ簱鍙�3
staNo: 104
@@ -64,7 +106,7 @@
rack: 0
emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
staNo: 100
- ip: 192.168.1.140
+ ip: 192.168.4.250
outSta[4]: #鍑哄簱鍙�5
staNo: 104
outSta[3]: #鍑哄簱鍙�4
@@ -97,426 +139,4 @@
inSta[1]: #鍏ュ簱鍙�2
staNo: 102
barcode: ${wcs-slave.barcode[1].id}
- id: 1
- barcode[0]: #鏉＄爜鎵弿浠�1
- port: 51236
- ip: 10.10.10.52
- id: 1
-
- crn[2]: #鍫嗗灈鏈�3
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 105
- row: 9
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- ip: 192.168.1.120
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 104
- row: 8
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- id: 3
- slot: 0
- demo: false
- crn[3]: #鍫嗗灈鏈�4
- rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- port: 102
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 107
- row: 12
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- ip: 192.168.1.130
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 106
- row: 11
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- id: 4
- slot: 0
- demo: false
-
-
-# crn[0]: #鍫嗗灈鏈�1
-# id: 1
-# ip: 172.17.91.2
-# slot: 0
-# demo: false
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 100
-# row: 2
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 103
-# row: 3
-# bay: 1
-# lev: 1
-# backSta: 102
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 200
-# row: 2
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
-# staNo: 205
-# row: 3
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crn[1]: #鍫嗗灈鏈�2
-# id: 2
-# ip: 172.17.91.7
-# slot: 0
-# demo: false
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 104
-# row: 5
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 107
-# row: 6
-# bay: 1
-# lev: 1
-# backSta: 106
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 206
-# row: 5
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
-# staNo: 211
-# row: 6
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crn[2]: #鍫嗗灈鏈�3
-# id: 3
-# ip: 172.17.91.12
-# slot: 0
-# demo: false
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 108
-# row: 8
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 111
-# row: 9
-# bay: 1
-# lev: 1
-# backSta: 110
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 212
-# row: 8
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
-# staNo: 217
-# row: 9
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crn[3]: #鍫嗗灈鏈�4
-# id: 4
-# ip: 172.17.91.17
-# slot: 0
-# demo: false
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 112
-# row: 12
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 115
-# row: 13
-# bay: 1
-# lev: 1
-# backSta: 114
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 218
-# row: 12
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
-# staNo: 223
-# row: 13
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crn[4]: #鍫嗗灈鏈�5
-# id: 5
-# ip: 172.17.91.22
-# slot: 0
-# demo: false
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 116
-# row: 16
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 119
-# row: 17
-# bay: 1
-# lev: 1
-# backSta: 118
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 224
-# row: 16
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
-# staNo: 229
-# row: 17
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crn[5]: #鍫嗗灈鏈�6
-# id: 6
-# ip: 172.17.91.27
-# slot: 0
-# demo: false
-# rack: 0
-# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# port: 102
-# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 120
-# row: 20
-# bay: 1
-# lev: 1
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
-# staNo: 123
-# row: 21
-# bay: 1
-# lev: 1
-# backSta: 122
-# devpPlcId: ${wcs-slave.devp[0].id}
-# crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
-# staNo: 230
-# row: 20
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
-# staNo: 235
-# row: 21
-# bay: 22
-# lev: 2
-# devpPlcId: ${wcs-slave.devp[1].id}
-# devp[0]: #杈撻�佺嚎
-# id: 1
-# ip: 172.17.91.36
-# rack: 0
-# port: 102
-# slot: 0
-# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
-# staNo: 103
-# emptyInSta[1]: #绌烘澘鍏ュ簱鍙�1
-# staNo: 105
-# emptyInSta[2]: #绌烘澘鍏ュ簱鍙�2
-# staNo: 109
-# emptyInSta[3]: #绌烘澘鍏ュ簱鍙�3
-# staNo: 113
-# emptyInSta[4]: #绌烘澘鍏ュ簱鍙�4
-# staNo: 117
-# emptyInSta[5]: #绌烘澘鍏ュ簱鍙�5
-# staNo: 121
-# inSta[0]: #鍏ュ簱鍙�1
-# #scale: ${wcs-slave.scale[0].id}
-# staNo: 103
-# backSta: 102
-# barcode: ${wcs-slave.barcode[0].id}
-# inSta[1]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 107
-# backSta: 106
-# barcode: ${wcs-slave.barcode[1].id}
-# #slot: 0
-# inSta[2]: #鍏ュ簱鍙�1
-# #scale: ${wcs-slave.scale[0].id}
-# staNo: 111
-# backSta: 110
-# barcode: ${wcs-slave.barcode[2].id}
-# inSta[3]: #鍏ュ簱鍙�1
-# #scale: ${wcs-slave.scale[0].id}
-# staNo: 115
-# backSta: 114
-# barcode: ${wcs-slave.barcode[3].id}
-# inSta[4]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 119
-# backSta: 118
-# barcode: ${wcs-slave.barcode[4].id}
-# #slot: 0
-# inSta[5]: #鍏ュ簱鍙�1
-# #scale: ${wcs-slave.scale[0].id}
-# staNo: 123
-# backSta: 122
-# barcode: ${wcs-slave.barcode[5].id}
-# outSta[0]: #鍑哄簱鍙�1
-# staNo: 100
-# outSta[1]: #鍑哄簱鍙�2
-# staNo: 104
-# outSta[2]: #鍑哄簱鍙�2
-# staNo: 108
-# outSta[3]: #鍑哄簱鍙�1
-# staNo: 112
-# outSta[4]: #鍑哄簱鍙�2
-# staNo: 116
-# outSta[5]: #鍑哄簱鍙�2
-# staNo: 120
-# devp[1]: #杈撻�佺嚎
-# id: 2
-# ip: 172.17.91.45
-# rack: 0
-# port: 102
-# slot: 0
-# inSta[0]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 205
-# backSta: 203
-# #barcode: ${wcs-slave.barcode[4].id}
-# inSta[1]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 211
-# backSta: 209
-# #barcode: ${wcs-slave.barcode[4].id}
-# inSta[2]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 217
-# backSta: 215
-# #barcode: ${wcs-slave.barcode[4].id}
-# inSta[3]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 223
-# backSta: 221
-# #barcode: ${wcs-slave.barcode[4].id}
-# inSta[4]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 229
-# backSta: 227
-# #barcode: ${wcs-slave.barcode[4].id}
-# inSta[5]: #鍏ュ簱鍙�2
-# #scale: ${wcs-slave.scale[1].id}
-# staNo: 235
-# backSta: 232
-# #barcode: ${wcs-slave.barcode[4].id}
-# outSta[0]: #鍑哄簱鍙�1
-# staNo: 200
-# outSta[1]: #鍑哄簱鍙�1
-# staNo: 206
-# outSta[2]: #鍑哄簱鍙�1
-# staNo: 212
-# outSta[3]: #鍑哄簱鍙�1
-# staNo: 218
-# outSta[4]: #鍑哄簱鍙�1
-# staNo: 224
-# outSta[5]: #鍑哄簱鍙�1
-# staNo: 230
-# devp[2]: #杈撻�佺嚎
-# id: 3
-# ip: 172.17.8.201
-# rack: 0
-# slot: 0
-# port: 102
-# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
-# staNo: 306
-# inSta[0]: #鍏ュ簱鍙�1
-# scale: ${wcs-slave.scale[1].id}
-# staNo: 301
-# barcode: ${wcs-slave.barcode[6].id}
-# backSta: 300
-# #slot: 0
-# outSta[0]: #鍑哄簱鍙�1
-# staNo: 307
-## devp[3]: #杈撻�佺嚎
-## id: 4
-## ip: 10.10.10.30
-## rack: 0
-## slot: 0
-## port: 102
-## emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
-## staNo: 406
-## inSta[0]: #鍏ュ簱鍙�1
-## scale: ${wcs-slave.scale[1].id}
-## staNo: 406
-## barcode: ${wcs-slave.barcode[1].id}
-## #slot: 0
-## outSta[0]: #鍑哄簱鍙�1
-## staNo: 407
-# scale[0]: #纾呯Г
-# port: 5005
-# ip: 10.10.10.201
-# id: 1
-# scale[1]: #纾呯Г
-# port: 5005
-# ip: 10.10.10.202
-# id: 2
-# barcode[0]: #鏉＄爜鎵弿浠�
-# port: 51236
-# ip: 172.17.91.39
-# id: 1
-# barcode[1]:
-# port: 51236
-# ip: 172.17.91.40
-# id: 2
-# barcode[2]:
-# port: 51236
-# ip: 172.17.91.41
-# id: 3
-# barcode[3]:
-# port: 51236
-# ip: 172.17.91.42
-# id: 4
-# barcode[4]:
-# port: 51236
-# ip: 172.17.91.43
-# id: 5
-# barcode[5]:
-# port: 51236
-# ip: 172.17.91.44
-# id: 6
-# barcode[6]:
-# port: 51236
-# ip: 172.17.8.203
-# id: 7
+ id: 1
\ No newline at end of file
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index faf62c1..192d827 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -4,7 +4,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp">
- <id column="DEC_NO" property="devNo" />
+ <id column="DEV_NO" property="devNo" />
<result column="DEC_DESC" property="decDesc" />
<result column="DEV_MK" property="devMk" />
<result column="IN_ENABLE" property="inEnable" />
--
Gitblit v1.9.1