From 135e1039d78e767536d91bcbce04d2efedb2f7b2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 29 五月 2023 20:37:18 +0800
Subject: [PATCH] 出入库优化-登记1
---
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutApiData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
similarity index 78%
rename from igds-core/src/main/java/com/ld/igds/inout/dto/InoutApiData.java
rename to igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
index 8414a0c..10168ff 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutApiData.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
@@ -11,28 +11,19 @@
* 鍑哄叆搴撴祦绋嬭繃绋嬩腑锛岃溅鐗屽け璐ワ紝璇诲崱鍣ㄧ瓑璁惧鐨勫叕鍏卞弬鏁板拰浼犻�掑璞�
*/
@Data
-public class InoutApiData implements Serializable {
+public class ApiInoutData implements Serializable {
private static final long serialVersionUID = 1L;
- @PropertyDef(label = "涓婚敭")
private String id;
- @PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @PropertyDef(label = "鎵�灞炲簱鐐�")
private String deptId;
@PropertyDef(label = "鍑哄叆搴撻厤濂楀簭鍙�")
private String sort = "1";
-
- @PropertyDef(label = "璁惧椤哄簭")
- private int inOrder = 1;
-
- @PropertyDef(label = "鎵�灞炴祦绋�")
- private String inoutProgress;
@PropertyDef(label = "璁惧鍚嶇О")
private String name;
@@ -40,10 +31,8 @@
@PropertyDef(label = "璁惧搴忓垪鍙�/璁惧缂栫爜")
private String sn;
- @PropertyDef(label = "鍒嗘満IP")
private String ip;
- @PropertyDef(label = "鍒嗘満绔彛")
private Integer port;
@PropertyDef(label = "甯愬彿")
@@ -57,9 +46,6 @@
@PropertyDef(label = "鎺у埗绔彛")
private Integer portCtrl;
-
- @PropertyDef(label = "WEB绔彛")
- private Integer portWeb;
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
@@ -88,9 +74,6 @@
private Date time = new Date();
- //璁惧缂栫爜
-// private String deviceId;
-
//淇℃伅
private String msg;
@@ -103,18 +86,22 @@
//绉伴噸淇℃伅
private double weight = 0.0;
+ //鍔ㄤ綔缂栫爜锛屼緥濡傚紑闂告満-鍏抽椄鏈虹瓑
+ private String actionCode;
- public InoutApiData() {
+ //鍔ㄤ綔缂栫爜锛岃澶囩紪鍙�
+ private String deviceId;
+
+
+ public ApiInoutData() {
super();
}
- public InoutApiData(InoutConf conf) {
+ public ApiInoutData(InoutConf conf) {
this.id = conf.getId();
this.companyId = conf.getCompanyId();
this.deptId = conf.getDeptId();
this.sort = conf.getSort();
- this.inOrder = conf.getInOrder();
- this.inoutProgress = conf.getInoutProgress();
this.name = conf.getName();
this.sn = conf.getSn();
this.ip = conf.getIp();
@@ -123,7 +110,6 @@
this.pwd = conf.getPwd();
this.chanNum = conf.getChanNum();
this.portCtrl = conf.getPortCtrl();
- this.portWeb = conf.getPortWeb();
this.type = conf.getType();
this.status = conf.getStatus();
this.protocol = conf.getProtocol();
--
Gitblit v1.9.3