锯切实体类更改

src/main/java/com/jeesite/modules/mes/entity/MesSaw.java

@@ -18,26 +18,6 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 		@Column(name="seq2_takt", attrName="seq2Takt", label="二序节拍(秒)"),
 		@Column(name="saw_speed", attrName="sawSpeed", label="锯切转速(r/min)"),
 		@Column(name="mill_speed", attrName="millSpeed", label="铣削转速(r/min)"),
-		@Column(name="servo_alarm", attrName="servoAlarm", label="伺服报警"),
-		@Column(name="inverter_fault", attrName="inverterFault", label="变频器异常(A1/C1)"),
-		@Column(name="inverter_overload", attrName="inverterOverload", label="变频器过负载OL"),
-		@Column(name="oil_mist_low", attrName="oilMistLow", label="油雾器液位低"),
-		@Column(name="chip_conveyor_trip", attrName="chipConveyorTrip", label="排屑机跳匝"),
-		@Column(name="hydraulic_trip", attrName="hydraulicTrip", label="液压站跳匝"),
-		@Column(name="water_cooler_stop", attrName="waterCoolerStop", label="水冷机停止中"),
-		@Column(name="manual_camera_alarm", attrName="manualCameraAlarm", label="人工位安全相机检测报警"),
-		@Column(name="saw_camera_alarm", attrName="sawCameraAlarm", label="锯切站内安全相机检测报警"),
-		@Column(name="cyl1_retract_fault", attrName="cyl1RetractFault", label="转台定位气缸1缩回检测故障"),
-		@Column(name="cyl1_extend_fault", attrName="cyl1ExtendFault", label="转台定位气缸1伸出检测故障"),
-		@Column(name="cyl2_retract_fault", attrName="cyl2RetractFault", label="转台定位气缸2缩回检测故障"),
-		@Column(name="cyl2_extend_fault", attrName="cyl2ExtendFault", label="转台定位气缸2伸出检测故障"),
-		@Column(name="cyl3_retract_fault", attrName="cyl3RetractFault", label="转台定位气缸3缩回检测故障"),
-		@Column(name="cyl3_extend_fault", attrName="cyl3ExtendFault", label="转台定位气缸3伸出检测故障"),
-		@Column(name="cyl4_retract_fault", attrName="cyl4RetractFault", label="转台定位气缸4缩回检测故障"),
-		@Column(name="cyl4_extend_fault", attrName="cyl4ExtendFault", label="转台定位气缸4伸出检测故障"),
-		@Column(name="estop_cabinet", attrName="estopCabinet", label="急停(电柜上)"),
-		@Column(name="estop_manual", attrName="estopManual", label="人工位急停"),
-		@Column(name="spindle_speed_alarm", attrName="spindleSpeedAlarm", label="主轴转速未达到报警"),
 		@Column(name="create_date", attrName="createDate", label="采集时间", isUpdate=false, isQuery=false, isUpdateForce=true),
 	}, orderBy="a.id DESC"
 )
@@ -48,52 +28,12 @@ public class MesSaw extends DataEntity<MesSaw> {
 	private String seq2Takt;
 	private String sawSpeed;
 	private String millSpeed;
-	private String servoAlarm;
-	private String inverterFault;
-	private String inverterOverload;
-	private String oilMistLow;
-	private String chipConveyorTrip;
-	private String hydraulicTrip;
-	private String waterCoolerStop;
-	private String manualCameraAlarm;
-	private String sawCameraAlarm;
-	private String cyl1RetractFault;
-	private String cyl1ExtendFault;
-	private String cyl2RetractFault;
-	private String cyl2ExtendFault;
-	private String cyl3RetractFault;
-	private String cyl3ExtendFault;
-	private String cyl4RetractFault;
-	private String cyl4ExtendFault;
-	private String estopCabinet;
-	private String estopManual;
-	private String spindleSpeedAlarm;
 
 	@ExcelFields({
 		@ExcelField(title="一序节拍(秒)", attrName="seq1Takt", align=Align.CENTER, sort=20),
 		@ExcelField(title="二序节拍(秒)", attrName="seq2Takt", align=Align.CENTER, sort=30),
 		@ExcelField(title="锯切转速(r/min)", attrName="sawSpeed", align=Align.CENTER, sort=40),
 		@ExcelField(title="铣削转速(r/min)", attrName="millSpeed", align=Align.CENTER, sort=50),
-		@ExcelField(title="伺服报警", attrName="servoAlarm", align=Align.CENTER, sort=60),
-		@ExcelField(title="变频器异常(A1/C1)", attrName="inverterFault", align=Align.CENTER, sort=70),
-		@ExcelField(title="变频器过负载OL", attrName="inverterOverload", align=Align.CENTER, sort=80),
-		@ExcelField(title="油雾器液位低", attrName="oilMistLow", align=Align.CENTER, sort=90),
-		@ExcelField(title="排屑机跳匝", attrName="chipConveyorTrip", align=Align.CENTER, sort=100),
-		@ExcelField(title="液压站跳匝", attrName="hydraulicTrip", align=Align.CENTER, sort=110),
-		@ExcelField(title="水冷机停止中", attrName="waterCoolerStop", align=Align.CENTER, sort=120),
-		@ExcelField(title="人工位安全相机检测报警", attrName="manualCameraAlarm", align=Align.CENTER, sort=130),
-		@ExcelField(title="锯切站内安全相机检测报警", attrName="sawCameraAlarm", align=Align.CENTER, sort=140),
-		@ExcelField(title="转台定位气缸1缩回检测故障", attrName="cyl1RetractFault", align=Align.CENTER, sort=150),
-		@ExcelField(title="转台定位气缸1伸出检测故障", attrName="cyl1ExtendFault", align=Align.CENTER, sort=160),
-		@ExcelField(title="转台定位气缸2缩回检测故障", attrName="cyl2RetractFault", align=Align.CENTER, sort=170),
-		@ExcelField(title="转台定位气缸2伸出检测故障", attrName="cyl2ExtendFault", align=Align.CENTER, sort=180),
-		@ExcelField(title="转台定位气缸3缩回检测故障", attrName="cyl3RetractFault", align=Align.CENTER, sort=190),
-		@ExcelField(title="转台定位气缸3伸出检测故障", attrName="cyl3ExtendFault", align=Align.CENTER, sort=200),
-		@ExcelField(title="转台定位气缸4缩回检测故障", attrName="cyl4RetractFault", align=Align.CENTER, sort=210),
-		@ExcelField(title="转台定位气缸4伸出检测故障", attrName="cyl4ExtendFault", align=Align.CENTER, sort=220),
-		@ExcelField(title="急停(电柜上)", attrName="estopCabinet", align=Align.CENTER, sort=230),
-		@ExcelField(title="人工位急停", attrName="estopManual", align=Align.CENTER, sort=240),
-		@ExcelField(title="主轴转速未达到报警", attrName="spindleSpeedAlarm", align=Align.CENTER, sort=250),
 		@ExcelField(title="采集时间", attrName="createDate", align=Align.CENTER, sort=260),
 	})
 	public MesSaw() {
@@ -112,44 +52,4 @@ public class MesSaw extends DataEntity<MesSaw> {
 	public void setSawSpeed(String v) { this.sawSpeed = v; }
 	public String getMillSpeed() { return millSpeed; }
 	public void setMillSpeed(String v) { this.millSpeed = v; }
-	public String getServoAlarm() { return servoAlarm; }
-	public void setServoAlarm(String v) { this.servoAlarm = v; }
-	public String getInverterFault() { return inverterFault; }
-	public void setInverterFault(String v) { this.inverterFault = v; }
-	public String getInverterOverload() { return inverterOverload; }
-	public void setInverterOverload(String v) { this.inverterOverload = v; }
-	public String getOilMistLow() { return oilMistLow; }
-	public void setOilMistLow(String v) { this.oilMistLow = v; }
-	public String getChipConveyorTrip() { return chipConveyorTrip; }
-	public void setChipConveyorTrip(String v) { this.chipConveyorTrip = v; }
-	public String getHydraulicTrip() { return hydraulicTrip; }
-	public void setHydraulicTrip(String v) { this.hydraulicTrip = v; }
-	public String getWaterCoolerStop() { return waterCoolerStop; }
-	public void setWaterCoolerStop(String v) { this.waterCoolerStop = v; }
-	public String getManualCameraAlarm() { return manualCameraAlarm; }
-	public void setManualCameraAlarm(String v) { this.manualCameraAlarm = v; }
-	public String getSawCameraAlarm() { return sawCameraAlarm; }
-	public void setSawCameraAlarm(String v) { this.sawCameraAlarm = v; }
-	public String getCyl1RetractFault() { return cyl1RetractFault; }
-	public void setCyl1RetractFault(String v) { this.cyl1RetractFault = v; }
-	public String getCyl1ExtendFault() { return cyl1ExtendFault; }
-	public void setCyl1ExtendFault(String v) { this.cyl1ExtendFault = v; }
-	public String getCyl2RetractFault() { return cyl2RetractFault; }
-	public void setCyl2RetractFault(String v) { this.cyl2RetractFault = v; }
-	public String getCyl2ExtendFault() { return cyl2ExtendFault; }
-	public void setCyl2ExtendFault(String v) { this.cyl2ExtendFault = v; }
-	public String getCyl3RetractFault() { return cyl3RetractFault; }
-	public void setCyl3RetractFault(String v) { this.cyl3RetractFault = v; }
-	public String getCyl3ExtendFault() { return cyl3ExtendFault; }
-	public void setCyl3ExtendFault(String v) { this.cyl3ExtendFault = v; }
-	public String getCyl4RetractFault() { return cyl4RetractFault; }
-	public void setCyl4RetractFault(String v) { this.cyl4RetractFault = v; }
-	public String getCyl4ExtendFault() { return cyl4ExtendFault; }
-	public void setCyl4ExtendFault(String v) { this.cyl4ExtendFault = v; }
-	public String getEstopCabinet() { return estopCabinet; }
-	public void setEstopCabinet(String v) { this.estopCabinet = v; }
-	public String getEstopManual() { return estopManual; }
-	public void setEstopManual(String v) { this.estopManual = v; }
-	public String getSpindleSpeedAlarm() { return spindleSpeedAlarm; }
-	public void setSpindleSpeedAlarm(String v) { this.spindleSpeedAlarm = v; }
 }