From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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..796493d 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;
//璁惧鍔熺巼
@@ -176,43 +199,62 @@
private String equipmentNormalTime;
// 璁惧ID
+ @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