From cd358c47735a8f551ab755afed51f3aa2c1bea15 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 31 三月 2025 14:10:47 +0800
Subject: [PATCH] wcs电视机代码移植
---
src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java | 31 ++
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 46 +++
src/main/java/com/zy/asrs/domain/enums/WorkNoType.java | 48 ++++
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 28 ++
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 53 ++++
src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java | 38 +++
src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java | 20 +
src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 47 +++
src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java | 20 +
src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java | 29 ++
src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java | 42 +++
src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java | 30 ++
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 65 +++++
src/main/java/com/zy/asrs/domain/vo/LocChartPie.java | 37 +++
src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java | 18 +
src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java | 18 +
src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java | 90 +++++++
src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java | 20 +
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 40 +++
19 files changed, 720 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
new file mode 100644
index 0000000..cbb46b7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.domain.dto;
+
+/**
+ * 鍏ュ嚭搴撶粺璁℃洸绾垮浘
+ * @author admin
+ * @date 2018骞�12鏈�12鏃�
+ */
+public class WorkChartAxis {
+ private String ymd;
+ private int inqty;
+ private int outqty;
+
+ public String getYmd() {
+ return ymd;
+ }
+ public void setYmd(String ymd) {
+ this.ymd = ymd;
+ }
+ public int getInqty() {
+ return inqty;
+ }
+ public void setInqty(int inqty) {
+ this.inqty = inqty;
+ }
+ public int getOutqty() {
+ return outqty;
+ }
+ public void setOutqty(int outqty) {
+ this.outqty = outqty;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
new file mode 100644
index 0000000..99b6d01
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -0,0 +1,53 @@
+package com.zy.asrs.domain.enums;
+
+/**
+ * 鍫嗗灈鏈虹姸鎬佹灇涓�
+ */
+public enum CrnStatusType {
+
+ // 鍏ュ簱
+ MACHINE_PAKIN("鍏ュ簱"),
+ // 鍑哄簱
+ MACHINE_PAKOUT("鍑哄簱"),
+ // 搴撳埌搴�
+ MACHINE_STOCK_MOVE("搴撳埌搴�"),
+ // 绔欏埌绔�
+ MACHINE_SITE_MOVE("绔欏埌绔�"),
+ // p to p
+ MACHINE_P_MOVE("PToP"),
+ // 寮傚父
+ MACHINE_ERROR("寮傚父"),
+ // 鑷姩
+ MACHINE_AUTO("鑷姩"),
+ // 闈炶嚜鍔�/鎵嬪姩
+ MACHINE_UN_AUTO("闈炶嚜鍔�"),
+ ;
+
+ private String desc;
+ CrnStatusType(String desc){
+ this.desc = desc;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public static CrnStatusType process(Integer ioType){
+ if (ioType>100) {
+ return MACHINE_PAKOUT;
+ } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
+ return MACHINE_PAKIN;
+ } else if (ioType == 3) {
+ return MACHINE_SITE_MOVE;
+ } else if (ioType == 11) {
+ return MACHINE_STOCK_MOVE;
+ } else {
+ return MACHINE_ERROR;
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
new file mode 100644
index 0000000..b3adb37
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -0,0 +1,46 @@
+package com.zy.asrs.domain.enums;
+
+
+import com.zy.core.model.protocol.StaProtocol;
+
+/**
+ * 绔欑偣鐘舵�佹灇涓�
+ */
+public enum SiteStatusType {
+
+ // 鑷姩
+ SITE_AUTO,
+ // 闈炶嚜鍔�
+ SITE_UNAUTO,
+ // 鑷姩+鏈夌墿+ID
+ SITE_AUTO_RUN_ID,
+ // 鑷姩+鏈夌墿
+ SITE_AUTO_RUN,
+ // 鑷姩+ID
+ SITE_AUTO_ID,
+
+ ;
+
+ public static SiteStatusType process(StaProtocol staProtocol){
+ if (staProtocol == null) {
+ return null;
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0) {
+ return SITE_AUTO_RUN_ID;
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading()) {
+ return SITE_AUTO_RUN;
+ }
+ if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0) {
+ return SITE_AUTO_ID;
+ }
+ if (staProtocol.isAutoing()) {
+ return SITE_AUTO;
+ }
+ if (!staProtocol.isAutoing()) {
+ return SITE_UNAUTO;
+ }
+ return null;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java b/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
new file mode 100644
index 0000000..4aa3911
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.domain.enums;
+
+import com.core.exception.CoolException;
+
+/**
+ * 宸ヤ綔鍙锋帓搴忚鍒�
+ */
+public enum WorkNoType {
+
+ PAKIN(0),
+ PICK(1),
+ PAKOUT(2),
+ OTHER(3),
+ ;
+
+ public Integer type;
+
+ WorkNoType(Integer type) {
+ this.type = type;
+ }
+
+ public static Integer getWorkNoType(Integer ioType) {
+ switch (ioType) {
+ case 1:
+ return PAKIN.type;
+ case 10:
+ return PAKIN.type;
+ case 11:
+ return PICK.type;
+ case 53:
+ case 54:
+ case 57:
+ return PICK.type;
+ case 101:
+ return PAKOUT.type;
+ case 103:
+ case 104:
+ case 107:
+ return PICK.type;
+ case 110:
+ return PAKOUT.type;
+ default:
+ break;
+ }
+ throw new CoolException(ioType + "鐨勪换鍔＄被鍨嬫棤娉曠敓鎴愬伐浣滃彿");
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java b/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
new file mode 100644
index 0000000..c724435
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+/**
+ * 鍫嗗灈鏈烘紨绀烘搷浣滃叆鍙�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class CrnDemoParam {
+
+ // 鎿嶄綔绫诲瀷 1: 鎵撳紑; 0: 鍏抽棴
+ private Integer crnId;
+
+ // 瀵嗙爜鍙ｄ护
+ private String password;
+
+ private Boolean opt;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
new file mode 100644
index 0000000..f85698e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
@@ -0,0 +1,38 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CrnOperatorParam {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 婧愮珯
+ private Short sourceStaNo;
+
+ // 婧愬簱浣�-鎺�
+ private Short sourceRow;
+
+ // 婧愬簱浣�-鍒�
+ private Short sourceBay;
+
+ // 婧愬簱浣�-灞�
+ private Short sourceLev;
+
+ // 鐩爣绔�
+ private Short staNo;
+
+ // 鐩爣搴撲綅-鎺�
+ private Short row;
+
+ // 鐩爣搴撲綅-鍒�
+ private Short bay;
+
+ // 鐩爣搴撲綅-灞�
+ private Short lev;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java b/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
new file mode 100644
index 0000000..02bec5a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.domain.param;
+
+/**
+ * 绯荤粺杩愯鐘舵�佹搷浣滃叆鍙�
+ * Created by vincent on 2020-06-03
+ */
+public class SystemSwitchParam {
+
+ // 鎿嶄綔绫诲瀷 1: 鎵撳紑; 0: 鍏抽棴
+ private Integer operatorType;
+
+ // 瀵嗙爜鍙ｄ护
+ private String password;
+
+ public Integer getOperatorType() {
+ return operatorType;
+ }
+
+ public void setOperatorType(Integer operatorType) {
+ this.operatorType = operatorType;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
new file mode 100644
index 0000000..acfc261
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 鎵爜鍣ㄥ疄鏃舵暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class BarcodeDataVo {
+
+ // 鎵爜鍣ㄧ紪鍙�
+ private Integer barcodeId;
+
+ // 鎵爜鍣ㄥ唴瀹�
+ private String codeValue;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java b/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
new file mode 100644
index 0000000..37fa9c0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CommandLogVo {
+
+ // 鍫嗗灈鏈虹紪鍙�
+ private Integer crnNo;
+
+ // 鐘舵��
+ private Integer status;
+
+ // 鍛戒护鎶ユ枃
+ private String command;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
new file mode 100644
index 0000000..434cedc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 鍫嗗灈鏈鸿鎯呰鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class CrnDetailVo {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 婧愮珯
+ private String sourceStaNo = "";
+
+ // 鐩爣绔�
+ private String staNo = "";
+
+ // 宸ヤ綔鐘舵��
+ private String wrkSts = "";
+
+ // 鍑哄叆绫诲瀷
+ private String ioType = "";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "";
+
+ // 鐩爣搴撲綅
+ private String locNo = "";
+
+ // 鍫嗗灈鏈虹姸鎬�
+ private String crnStatus = "";
+
+ // 寮傚父
+ private String error = "";
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
new file mode 100644
index 0000000..3200202
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.domain.enums.CrnStatusType;
+import lombok.Data;
+
+/**
+ * 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-01
+ */
+@Data
+public class CrnLatestDataVo {
+
+ // 鍫嗗灈鏈虹紪鍙�
+ private Integer crnId;
+
+ // 鍋忕Щ閲�
+ private Double offset;
+
+ // 褰撳墠鍒�
+ private Short bay;
+
+ private CrnStatusType crnStatus;
+
+ public String getCrnStatus(){
+ return crnStatus.toString().toLowerCase().replaceAll("_", "-");
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
new file mode 100644
index 0000000..ef124a3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -0,0 +1,90 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.utils.Utils;
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CrnMsgTableVo {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo = 0;
+
+ // 鐘舵��
+ private String status = "-";
+
+ // 婧愮珯
+ private String sourceStaNo = "-";
+
+ // 鐩爣绔�
+ private String staNo = "-";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "-";
+
+ // 鐩爣搴撲綅
+ private String locNo = "-";
+
+ // 寮傚父
+ private String error = "";
+
+ // 鍘熺偣
+ private String origin = "";
+
+ // 鍛戒护
+ private String command = "";
+
+ // 璧拌閫熷害锛坢/min)
+ private Float xspeed = 0.0F;
+
+ // 鍗囬檷閫熷害锛坢/min)
+ private Float yspeed = 0.0F;
+
+ // 鍙夌墮閫熷害锛坢/min)
+ private Float zspeed = 0.0F;
+
+ // 璧拌璺濈(Km)
+ private Float xdistance = 0.0F;
+
+ // 鍗囬檷璺濈(Km)
+ private Float ydistance = 0.0F;
+
+ // 璧拌鏃堕暱(H)
+ private Float xduration = 0.0F;
+
+ // 鍗囬檷鏃堕暱(H)
+ private Float yduration = 0.0F;
+
+ public void setXspeed(Float xspeed) {
+ this.xspeed = Utils.scale(xspeed);
+ }
+
+ public void setYspeed(Float yspeed) {
+ this.yspeed = Utils.scale(yspeed);
+ }
+
+ public void setZspeed(Float zspeed) {
+ this.zspeed = Utils.scale(zspeed);
+ }
+
+ public void setXdistance(Float xdistance) {
+ this.xdistance = Utils.scale(xdistance);
+ }
+
+ public void setYdistance(Float ydistance) {
+ this.ydistance = Utils.scale(ydistance);
+ }
+
+ public void setXduration(Float xduration) {
+ this.xduration = Utils.scale(xduration);
+ }
+
+ public void setYduration(Float yduration) {
+ this.yduration = Utils.scale(yduration);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
new file mode 100644
index 0000000..4e9f53a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -0,0 +1,65 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class CrnStateTableVo {
+
+ // 鍫嗗灈鏈哄彿
+ private Integer crnNo;
+
+ // 妯″紡
+ private String statusType = "-";
+
+ // 鏈夌墿
+ private String loading = "-";
+
+ // 鍒�
+ private Short bay;
+
+ // 灞�
+ private Short lev;
+
+ // 璧拌鍘熺偣
+ private String xOrigin = "-";
+
+ // 鍗囬檷鍘熺偣
+ private String yOrigin = "-";
+
+ // 璐у弶浣嶇疆
+ private String forkOffset = "-";
+
+ // 杞借揣鍙颁綅缃�
+ private String liftPos = "-";
+
+ // 璧拌瀹氫綅
+ private String walkPos = "-";
+
+ // 鎬ュ仠
+ private String stop = "-";
+
+ // 鍒楀潗鏍�
+ private String bayCoor = "-";
+
+ // 灞傚潗鏍�
+ private String levCoor = "-";
+
+ // 瀹屾垚
+ private String complete = "-";
+
+ // 浠诲姟鍙�
+ private Short workNo = 0;
+
+ // 鐘舵��
+ private String status = "-";
+
+ // 寮傚父鐮�
+ private String warnCode = "-";
+
+ // 鍨傜洿鏁呴殰鐮�
+ private String alarm = "-";
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
new file mode 100644
index 0000000..1492d1b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
@@ -0,0 +1,37 @@
+package com.zy.asrs.domain.vo;
+
+/**
+ * 搴撲綅鍗犵敤鐧惧垎姣�
+ * @author admin
+ * @date 2018骞�12鏈�12鏃�
+ */
+public class LocChartPie {
+ private int fqty;
+ private int oqty;
+ private int uqty;
+ private int xqty;
+ public int getFqty() {
+ return fqty;
+ }
+ public void setFqty(int fqty) {
+ this.fqty = fqty;
+ }
+ public int getOqty() {
+ return oqty;
+ }
+ public void setOqty(int oqty) {
+ this.oqty = oqty;
+ }
+ public int getUqty() {
+ return uqty;
+ }
+ public void setUqty(int uqty) {
+ this.uqty = uqty;
+ }
+ public int getXqty() {
+ return xqty;
+ }
+ public void setXqty(int xqty) {
+ this.xqty = xqty;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
new file mode 100644
index 0000000..38fed7e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class PlcErrorTableVo {
+
+ // 搴忓彿
+ private Integer no;
+
+ // plc寮傚父鎻忚堪
+ private String plcDesc;
+
+ // 寮傚父
+ private String error;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java b/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
new file mode 100644
index 0000000..1b1aefb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 纾呯Г瀹炴椂鏁版嵁瑙嗗浘瀵硅薄
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class ScaleDataVo {
+
+ // 纾呯Г缂栧彿
+ private Integer scaleId;
+
+ // 纾呯Г鍐呭
+ private String value;
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
new file mode 100644
index 0000000..7cdcf91
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 杈撻�佽澶囪鎯呰鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+@Data
+public class SiteDetailVo {
+
+ // 绔欑偣缂栧彿
+ private Integer siteId;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 宸ヤ綔鐘舵��
+ private String wrkSts = "";
+
+ // 鑷姩
+ private String autoing;
+
+ // 鏈夌墿
+ private String loading;
+
+ // 鑳藉叆
+ private String canining;
+
+ // 鑳藉嚭
+ private String canouting;
+
+ // 鍑哄叆绫诲瀷
+ private String ioType = "";
+
+ // 婧愮珯
+ private String sourceStaNo = "";
+
+ // 鐩爣绔�
+ private String staNo = "";
+
+ // 婧愬簱浣�
+ private String sourceLocNo = "";
+
+ // 鐩爣搴撲綅
+ private String locNo = "";
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
new file mode 100644
index 0000000..2677861
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
@@ -0,0 +1,29 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.domain.enums.SiteStatusType;
+import lombok.Data;
+
+/**
+ * 绔欑偣鏈�鏂版暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-01
+ */
+@Data
+public class SiteLatestDataVo {
+
+ // 绔欑偣缂栧彿
+ private String siteId;
+
+ // 宸ヤ綔鍙�
+ private Short workNo;
+
+ // 绔欑偣鐘舵��
+ private SiteStatusType siteStatus;
+
+ // 闅斿绔欑偣锛堝彴杞︾壒鎬э級
+ private String nearbySta;
+
+ public String getSiteStatus() {
+ return siteStatus.toString().toLowerCase().replaceAll("_", "-");
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
new file mode 100644
index 0000000..42b7bc9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -0,0 +1,40 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020-06-02
+ */
+@Data
+public class SiteTableVo {
+
+ // 绔欏彿
+ private Integer devNo;
+
+ // 宸ヤ綔鍙�
+ private Short workNo = 0;
+
+ // 鑷姩
+ private String autoing = "-";
+
+ // 鏈夌墿
+ private String loading = "-";
+
+ // 鍙叆
+ private String inEnable = "-";
+
+ // 鍙嚭
+ private String outEnable = "-";
+
+ // 闇�姹�1
+ private String pakMk = "-";
+
+ // 绌烘澘淇″彿
+ private String emptyMk = "-";
+
+ // 鐩爣绔�
+ private Short staNo = 0;
+
+ //楂樹綆搴撲綅
+ private String locType1 = "-";
+}
--
Gitblit v1.9.1