From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
index e5c2999..8d85fc5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.XYZAliases;
@@ -17,6 +18,7 @@
private String equipmentModel;
//閲囬泦鏃堕棿
+ @JSONField(name = "CollectTime")
private Date CollectTime;
//璁惧缂栧彿
private String equipmentID;
@@ -39,8 +41,10 @@
//瀹為檯杩涚粰閫熷害
private String actualfeedrate;
//绋嬪簭鎵ц琛屾暟
+ @JSONField(name = "Programnumber")
private String Programnumber;
//搴忓垪鍙�
+ @JSONField(name = "Sequencenumber")
private String Sequencenumber;
//鎵ц浠ｇ爜
private String executingcode;
@@ -53,36 +57,55 @@
//宸ヤ綔鐘舵��
private String workstate;
//鎶ヨ鐘舵��
+ @JSONField(name = "ALRMstate")
private String ALRMstate;
//宸ヤ欢鍚嶇О
+ @JSONField(name = "ProductName")
private String ProductName;
+ //宸ヤ欢鏁伴噺
+ @JSONField(name = "ProductCount")
+ private String ProductCount;
//鏈哄簥X杞村潗鏍�
+ @JSONField(name = "Xmachine")
private String Xmachine;
//鏈哄簥Y杞村潗鏍�
+ @JSONField(name = "Ymachine")
private String Ymachine;
//鏈哄簥Y杞村潗鏍�
+ @JSONField(name = "Zmachine")
private String Zmachine;
//鏈哄簥Z杞村潗鏍�
+ @JSONField(name = "Amachine")
private String Amachine;
//鏈哄簥A杞村潗鏍�
+ @JSONField(name = "Bmachine")
private String Bmachine;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Xabsolute")
private String Xabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Yabsolute")
private String Yabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Zabsolute")
private String Zabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Aabsolute")
private String Aabsolute;
//X杞村潗鏍囩粷瀵瑰潗鏍�
+ @JSONField(name = "Babsolute")
private String Babsolute;
//绯荤粺鐗堟湰鍙�
+ @JSONField(name = "SystemVersion")
private String SystemVersion;
//鏁版帶绯荤粺鍨嬪彿
+ @JSONField(name = "SystemType")
private String SystemType;
//鏈�澶ц酱鏁�
+ @JSONField(name = "MaxAxis")
private String MaxAxis;
//鏈夋晥杞存暟
+ @JSONField(name = "ValidAxis")
private String ValidAxis;
//璁惧鍔熺巼
@@ -135,20 +158,33 @@
* lsv2
*/
//鎿嶄綔妯″紡
+ @JSONField(name = "OperationType")
private String operationType;
//褰撳墠绋嬪簭
private String program;
//绋嬪簭鎵ц鐐�
+ @JSONField(name = "ProgramPosition")
private String programPosition;
//蹇�熻繘缁欏�嶇巼
+ @JSONField(name = "Rapidfeed")
private String rapidfeed;
//绗竴涓敊璇彿
+ @JSONField(name = "FirstErrorNum")
private String firstErrorNum;
//绗竴涓敊璇�
+ @JSONField(name = "FirstError")
private String firstError;
//绗簩涓敊璇彿
+ @JSONField(name = "SecondErrorNum")
private String secondErrorNum;
+ //杩涚粰鍊嶇巼
+ @JSONField(name = "Ffeed")
+ private String fFeed;
+ //涓昏酱鍊嶇巼
+ @JSONField(name = "Sfeed")
+ private String sFeed;
//绗簩涓敊璇�
+ @JSONField(name = "SecondError")
private String secondError;
//X鍧愭爣
private String x;
@@ -163,56 +199,81 @@
//C鍧愭爣
private String c;
//閿欒淇℃伅
+ @JSONField(name = "Errorinfo")
private String errorinfo;
//璁惧淇℃伅
+ @JSONField(name = "Equipmentinfo")
private String equipmentinfo;
//鍩虹淇℃伅
+ @JSONField(name = "Basicinfo")
private String basicinfo;
//棰勮鏁版嵁
+ @JSONField(name = "Preinstall")
private String preinstall;
//NC姝ｅ父杩愯鏃堕棿
+ @JSONField(name = "NCNormalTime")
private String nCNormalTime;
//璁惧姝ｅ父杩愯鏃堕棿
+ @JSONField(name = "EquipmentNormalTime")
private String equipmentNormalTime;
// 璁惧ID
- private String EquipmentID;
+// @JSONField(name = "EquipmentID")
+// private String EquipmentID;
// KI1鐘舵��
+ @JSONField(name = "P1001")
private String P1001;
// KI2鐘舵��
+ @JSONField(name = "P1002")
private String P1002;
// KI3鐘舵��
+ @JSONField(name = "P1003")
private String P1003;
// KI4鐘舵��
+ @JSONField(name = "P1004")
private String P1004;
// AI1鏁版嵁
+ @JSONField(name = "P1005")
private String P1005;
// AI2鏁版嵁
+ @JSONField(name = "P1006")
private String P1006;
// KI1璁℃暟
+ @JSONField(name = "P1007")
private String P1007;
// KI2璁℃暟
+ @JSONField(name = "P1008")
private String P1008;
// KI3璁℃暟
+ @JSONField(name = "P1009")
private String P1009;
// KI4璁℃暟
+ @JSONField(name = "P1010")
private String P1010;
// KO1杈撳嚭
+ @JSONField(name = "P1011")
private String P1011;
// KO2杈撳嚭
+ @JSONField(name = "P1012")
private String P1012;
//璁惧杩愯鏃堕棿
+ @JSONField(name = "EquipmentTime")
private String EquipmentTime;
//褰撳墠鍒�鍏峰彿
+ @JSONField(name = "ToolNum")
private String ToolNum;
//NC鐗堟湰
+ @JSONField(name = "NCVersion")
private String NCVersion;
//TNC鐗堟湰
+ @JSONField(name = "TNCVersion")
private String TNCVersion;
//OPT鐗堟湰
+ @JSONField(name = "OPTVersion")
private String OPTVersion;
//PLC鐗堟湰
+ @JSONField(name = "PLCVersion")
private String PLCVersion;
//澶囨敞
--
Gitblit v1.9.3