完善查询日志的接口

MasstransferCommon/Model/Entity/Substrate.cs

@@ -1,34 +0,0 @@
-using System.ComponentModel;
-using MasstransferCommon.Model.Enum;
-using SQLite;
-
-namespace MasstransferCommon.Model.Entity;
-
-/// <summary>
-/// 基板信息
-/// </summary>
-[Table("substrates")]
-public class Substrate : Entity
-{
-    [Column("context_id"), Description("上下文ID")]
-    public string? ContextId { get; set; }
-
-    [Column("substrate_code"), Description("基板编号")]
-    public string SubstrateCode { get; set; }
-
-    [Column("jig_code"), Description("治具编号")]
-    public string JigCode { get; set; }
-
-    [Column("substrate_type"), Description("基板类型")]
-    public SubstrateTypeEnum SubstrateType { get; set; }
-
-    [Column("row"), Description("基板行")] public int Row { get; set; }
-
-    [Column("column"), Description("基板列")] public int Column { get; set; }
-
-    [Column("batch_no"), Description("批次号")]
-    public string BatchNo { get; set; }
-
-    [Column("formula_id"), Description("配方ID")]
-    public string FormulaId { get; set; }
-}

MasstransferCommon/Model/Entity/Wafer.cs

@@ -1,22 +0,0 @@
-using System.ComponentModel;
-using SQLite;
-
-namespace MasstransferCommon.Model.Entity;
-
-[Table("wafers"), Description("晶环信息")]
-public class Wafer : Entity
-{
-    [Column("wafer_code"), Description("晶片编号")]
-    public string? WaferCode { get; set; }
-
-    [Column("color"), Description("晶片颜色")] public ChipColorEnum Color { get; set; }
-
-    [Column("context_id"), Description("上下文id")]
-    public string? ContextId { get; set; }
-
-    [Column("column"), Description("列")] public int Column { get; set; }
-
-    [Column("row"), Description("行")] public int Row { get; set; }
-
-    [Column("used"), Description("是否已使用")] public bool Used { get; set; }
-}

MasstransferExporter/DataExporter/FormulaService.cs

@@ -4,7 +4,6 @@ using MasstransferCommon.Model.Constant;
 using MasstransferCommon.Model.Entity;
 using MasstransferCommon.Utils;
 using MasstransferCommunicate.Mqtt.Client;
-using MasstransferCore.Model.Entity;
 using MasstransferExporter.DataExporter.Model;
 using MasstransferInfrastructure.Database.Sqlite;
 using Masuit.Tools;

MasstransferExporter/DataExporter/Model/AxisPositionParams.cs

@@ -1,16 +1,17 @@
 using System.ComponentModel;
 using MasstransferCommon.Model.Atrributes;
+using MasstransferCommon.Model.Entity;
 using SQLite;
 
-namespace MasstransferCore.Model.Entity;
+namespace MasstransferExporter.DataExporter.Model;
 
 /// <summary>
 /// ACS 位置参数
 /// </summary>
 [Table("axis_position_params"), Description("轴位置参数")]
-public class AxisPositionParams : MasstransferCommon.Model.Entity.Entity
+public class AxisPositionParams : Entity
 {
-    [Column("formula_id"), Description("配方Id")]
+    [Column("formula_id"), Description("配方Id"), Hide]
     public string FormulaId { get; set; }
 
 
@@ -34,6 +35,9 @@ public class AxisPositionParams : MasstransferCommon.Model.Entity.Entity
      Property(Group = "WaferY", Variable = "stAxisArPos", Axis = 0, Index = 4)]
     public double WaferYScannerPosition { get; set; }
 
+    [Column("wafer_y_replace_wafer_box_position"), Description("晶环龙门Y料盒更换位置"),
+     Property(Group = "WaferY", Variable = "stAxisArPos", Axis = 0, Index = 5)]
+    public double WaferYReplaceWaferBoxPosition { get; set; }
 
     [Column("needle_y_manual_position"), Description("针刺龙门Y手动位置"),
      Property(Group = "NeedleY", Variable = "stAxisArPos", Axis = 2, Index = 0)]
@@ -138,130 +142,90 @@ public class AxisPositionParams : MasstransferCommon.Model.Entity.Entity
     public double NeedleZServoJobPosition { get; set; }
 
 
-    [Column("wafer_z_servo_manual_position"), Description("晶环升降伺服Z手动位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 10, Index = 0)]
-    public double WaferZServoManualPosition { get; set; }
-
-    [Column("wafer_z_servo_idle_position"), Description("晶环升降伺服Z待机位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 10, Index = 1)]
-    public double WaferZServoIdlePosition { get; set; }
-
     [Column("wafer_rotate_servo_manual_position"), Description("晶环旋转伺服手动位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 10, Index = 0)]
     public double WaferRotateServoManualPosition { get; set; }
 
     [Column("wafer_rotate_servo_idle_position"), Description("晶环旋转伺服待机位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 10, Index = 1)]
     public double WaferRotateServoIdlePosition { get; set; }
 
     [Column("wafer_rotate_servo_origin_position"), Description("晶环旋转伺服相对原点位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 2)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 10, Index = 2)]
     public double WaferRotateServoOriginPosition { get; set; }
 
 
     [Column("wafer_z_servo_loading_manual_position"), Description("晶环换料升降伺服手动位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 0)]
     public double WaferZServoLoadingManualPosition { get; set; }
 
     [Column("wafer_z_servo_loading_idle_position"), Description("晶环换料升降伺服待机位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 1)]
     public double WaferZServoLoadingIdlePosition { get; set; }
 
     [Column("wafer_z_servo_relate_wafer_rotate_servo_loading_idle_position"), Description("晶环换料升降伺服晶环旋转端换料位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 2)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 2)]
     public double WaferZServoRelateWaferRotateServoLoadingIdlePosition { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box1_position"), Description("晶环换料升降伺服晶环料盒1层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 3)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 3)]
     public double WaferZServoToWaferBox1Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box2_position"), Description("晶环换料升降伺服晶环料盒2层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 4)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 4)]
     public double WaferZServoToWaferBox2Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box3_position"), Description("晶环换料升降伺服晶环料盒3层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 5)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 5)]
     public double WaferZServoToWaferBox3Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box4_position"), Description("晶环换料升降伺服晶环料盒4层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 6)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 6)]
     public double WaferZServoToWaferBox4Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box5_position"), Description("晶环换料升降伺服晶环料盒5层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 7)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 7)]
     public double WaferZServoToWaferBox5Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box6_position"), Description("晶环换料升降伺服晶环料盒6层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 8)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 8)]
     public double WaferZServoToWaferBox6Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box7_position"), Description("晶环换料升降伺服晶环料盒7层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 9)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 9)]
     public double WaferZServoToWaferBox7Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box8_position"), Description("晶环换料升降伺服晶环料盒8层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 10)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 10)]
     public double WaferZServoToWaferBox8Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box9_position"), Description("晶环换料升降伺服晶环料盒9层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 11)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 11)]
     public double WaferZServoToWaferBox9Position { get; set; }
 
     [Column("wafer_z_servo_to_wafer_box10_position"), Description("晶环换料升降伺服晶环料盒10层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 12)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 11, Index = 12)]
     public double WaferZServoToWaferBox10Position { get; set; }
 
     [Column("wafer_translation_servo_loading_manual_position"), Description("晶环换料平移伺服手动位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 0)]
     public double WaferTranslationServoLoadingManualPosition { get; set; }
 
     [Column("wafer_translation_servo_loading_idle_position"), Description("晶环换料平移伺服待机位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 1)]
     public double WaferTranslationServoLoadingIdlePosition { get; set; }
 
 
     [Column("wafer_translation_servo_relate_wafer_rotate_servo_loading_idle_position"),
      Description("晶环换料平移伺服晶环旋转端换料位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 2)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 2)]
     public double WaferTranslationServoRelateWaferRotateServoLoadingIdlePosition { get; set; }
 
-    [Column("wafer_translation_servo_to_wafer_box1_position"), Description("晶环换料平移伺服晶环料盒1层位置"),
+    [Column("wafer_translation_servo_to_wafer_box_take_wafer_position"), Description("晶环换料平移伺服晶环料盒端换料位置-取料"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 3)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 3)]
-    public double WaferTranslationServoToWaferBox1Position { get; set; }
+    public double WaferTranslationServoToWaferBoxTakeWaferPosition { get; set; }
 
-    [Column("wafer_translation_servo_to_wafer_box2_position"), Description("晶环换料平移伺服晶环料盒2层位置"),
+    [Column("wafer_translation_servo_to_wafer_box_put_wafer_position"), Description("晶环换料平移伺服晶环料盒端换料位置-放料"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 4)]
+     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 12, Index = 4)]
-    public double WaferTranslationServoToWaferBox2Position { get; set; }
+    public double WaferTranslationServoToWaferBoxPutWaferPosition { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box3_position"), Description("晶环换料平移伺服晶环料盒3层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 5)]
-    public double WaferTranslationServoToWaferBox3Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box4_position"), Description("晶环换料平移伺服晶环料盒4层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 6)]
-    public double WaferTranslationServoToWaferBox4Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box5_position"), Description("晶环换料平移伺服晶环料盒5层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 7)]
-    public double WaferTranslationServoToWaferBox5Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box6_position"), Description("晶环换料平移伺服晶环料盒6层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 8)]
-    public double WaferTranslationServoToWaferBox6Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box7_position"), Description("晶环换料平移伺服晶环料盒7层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 9)]
-    public double WaferTranslationServoToWaferBox7Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box8_position"), Description("晶环换料平移伺服晶环料盒8层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 10)]
-    public double WaferTranslationServoToWaferBox8Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box9_position"), Description("晶环换料平移伺服晶环料盒9层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 11)]
-    public double WaferTranslationServoToWaferBox9Position { get; set; }
-
-    [Column("wafer_translation_servo_to_wafer_box10_position"), Description("晶环换料平移伺服晶环料盒10层位置"),
-     Property(Group = "WaferLoading", Variable = "stAxisArPos", Axis = 13, Index = 12)]
-    public double WaferTranslationServoToWaferBox10Position { get; set; }
 }

MasstransferExporter/DataExporter/Model/AxisVariables.cs

@@ -11,113 +11,260 @@ namespace MasstransferExporter.DataExporter.Model;
 [Table("axis_variables"), Description("轴变量")]
 public class AxisVariables : Entity
 {
-    [Column("formula_id"), Description("配方Id")]
+    [Column("formula_id"), Description("配方Id"), Hide]
     public string FormulaId { get; set; }
 
-    [Column("needle_z_job_compensation"), Description("针刺Z轴工作补偿")]
+    [Column("wafer_y_motor_left_soft_limit"), Description("晶圆Y轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 0, Index = 0)]
+    public double WaferYMotorLeftSoftLimit { get; set; }
+
+    [Column("wafer_y_motor_right_soft_limit"), Description("晶圆Y轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 0, Index = 1)]
+    public double WaferYMotorRightSoftLimit { get; set; }
+
+    [Column("wafer_y_slave_motor_left_soft_limit"), Description("晶圆Y轴从机左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 1, Index = 0)]
+    public double WaferYSlaveMotorLeftSoftLimit { get; set; }
+
+    [Column("wafer_y_slave_motor_right_soft_limit"), Description("晶圆Y轴从机右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 1, Index = 1)]
+    public double WaferYSlaveMotorRightSoftLimit { get; set; }
+
+    [Column("needle_y_motor_left_soft_limit"), Description("针刺Y轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 2, Index = 0)]
+    public double NeedleYMotorLeftSoftLimit { get; set; }
+
+    [Column("needle_y_motor_right_soft_limit"), Description("针刺Y轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 2, Index = 1)]
+    public double NeedleYMotorRightSoftLimit { get; set; }
+
+    [Column("needle_y_slave_motor_left_soft_limit"), Description("针刺Y轴从机左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 3, Index = 0)]
+    public double NeedleYSlaveMotorLeftSoftLimit { get; set; }
+
+    [Column("needle_y_slave_motor_right_soft_limit"), Description("针刺Y轴从机右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 3, Index = 1)]
+    public double NeedleYSlaveMotorRightSoftLimit { get; set; }
+
+    [Column("wafer_x_motor_1_left_soft_limit"), Description("晶圆X轴1左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 4, Index = 0)]
+    public double WaferXMotor1LeftSoftLimit { get; set; }
+
+    [Column("wafer_x_motor_1_right_soft_limit"), Description("晶圆X轴1右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 4, Index = 1)]
+    public double WaferXMotor1RightSoftLimit { get; set; }
+
+    [Column("needle_x_motor1_left_soft_limit"), Description("针刺X轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 5, Index = 0)]
+    public double NeedleXMotor1LeftSoftLimit { get; set; }
+
+    [Column("needle_x_motor1_right_soft_limit"), Description("针刺X轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 5, Index = 1)]
+    public double NeedleXMotor1RightSoftLimit { get; set; }
+
+    [Column("wafer_x_motor_2_left_soft_limit"), Description("晶圆X轴2左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 6, Index = 0)]
+    public double WaferXMotor2LeftSoftLimit { get; set; }
+
+    [Column("wafer_x_motor_2_right_soft_limit"), Description("晶圆X轴2右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 6, Index = 1)]
+    public double WaferXMotor2RightSoftLimit { get; set; }
+
+    [Column("needle_x_motor2_left_soft_limit"), Description("针刺X轴2左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 7, Index = 0)]
+    public double NeedleXMotor2LeftSoftLimit { get; set; }
+
+    [Column("needle_x_motor2_right_soft_limit"), Description("针刺X轴2右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 7, Index = 1)]
+    public double NeedleXMotor2RightSoftLimit { get; set; }
+
+    [Column("needle_z_motor_left_soft_limit"), Description("针刺Z轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 8, Index = 0)]
+    public double NeedleZMotorLeftSoftLimit { get; set; }
+
+    [Column("needle_z_motor_right_soft_limit"), Description("针刺Z轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 8, Index = 1)]
+    public double NeedleZMotorRightSoftLimit { get; set; }
+
+    [Column("needle_z_servo_left_soft_limit"), Description("针刺Z轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 9, Index = 0)]
+    public double NeedleZServoLeftSoftLimit { get; set; }
+
+    [Column("needle_z_servo_right_soft_limit"), Description("针刺Z轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 9, Index = 1)]
+    public double NeedleZServoRightSoftLimit { get; set; }
+
+    [Column("wafer_rotate_servo_left_soft_limit"), Description("晶圆旋转轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 10, Index = 0)]
+    public double WaferRotateServoLeftSoftLimit { get; set; }
+
+    [Column("wafer_rotate_servo_right_soft_limit"), Description("晶圆旋转轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 10, Index = 1)]
+    public double WaferRotateServoRightSoftLimit { get; set; }
+
+    [Column("wafer_up_down_servo_left_soft_limit"), Description("晶圆上下轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 11, Index = 0)]
+    public double WaferUpDownServoLeftSoftLimit { get; set; }
+
+    [Column("wafer_up_down_servo_right_soft_limit"), Description("晶圆上下轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 11, Index = 1)]
+    public double WaferUpDownServoRightSoftLimit { get; set; }
+
+    [Column("wafer_translation_servo_left_soft_limit"), Description("晶圆平移轴左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 12, Index = 0)]
+    public double WaferTranslationServoLeftSoftLimit { get; set; }
+
+    [Column("wafer_translation_servo_right_soft_limit"), Description("晶圆平移轴右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 12, Index = 1)]
+    public double WaferTranslationServoRightSoftLimit { get; set; }
+
+    [Column("substrate_location_servo_left_soft_limit"), Description(" 基板定位步进电机左软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 13, Index = 0)]
+    public double SubstrateLocationServoLeftSoftLimit { get; set; }
+
+    [Column("substrate_location_servo_right_soft_limit"), Description(" 基板定位步进电机右软限位"),
+     Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 13, Index = 1)]
+    public double SubstrateLocationServoRightSoftLimit { get; set; }
+
+
+    [Column("needle_z_job_compensation"), Description("针刺Z轴工作补偿"),
+     Property(Group = "Job", Variable = "Axis8TransferPosPlus")]
     public double NeedleZJobCompensation { get; set; }
 
-    [Column("needle_x_1_flying_trigger_velocity"), Description("针刺X轴飞拍速度")]
+    [Column("needle_x_1_flying_trigger_velocity"), Description("针刺X轴飞拍速度"),
+     Property(Group = "Job", Variable = "axisFlyVel")]
     public double NeedleX1FlyingTriggerVelocity { get; set; }
 
-    [Column("job_frequency"), Description("动打频率")]
+    [Column("job_frequency"), Description("动打频率"), Property(Group = "Job", Variable = "axisTransferVel")]
     public int JobFrequency { get; set; }
 
-    [Column("wafer_y_auto_velocity"), Description("晶圆Y轴自动速度")]
+    [Column("wafer_y_auto_velocity"), Description("晶圆Y轴自动速度"),
+     Property(Group = "WaferY", Variable = "axisVel", Axis = 0, Index = 0)]
     public int WaferYAutoVelocity { get; set; }
 
-    [Column("wafer_y_auto_acceleration"), Description("晶圆Y轴自动加速度")]
+    [Column("wafer_y_auto_acceleration"), Description("晶圆Y轴自动加速度"),
+     Property(Group = "WaferY", Variable = "axisAcc", Axis = 0, Index = 0)]
     public int WaferYAutoAcceleration { get; set; }
 
-    [Column("wafer_y_auto_deceleration"), Description("晶圆Y轴自动减速度")]
+    [Column("wafer_y_auto_deceleration"), Description("晶圆Y轴自动减速度"),
+     Property(Group = "WaferY", Variable = "axisDec", Axis = 0, Index = 0)]
     public int WaferYAutoDeceleration { get; set; }
 
-    [Column("wafer_y_auto_jerk"), Description("晶圆Y轴自动加加速度")]
+    [Column("wafer_y_auto_jerk"), Description("晶圆Y轴自动加加速度"),
+     Property(Group = "WaferY", Variable = "axisJerk", Axis = 0, Index = 0)]
     public int WaferYAutoJerk { get; set; }
 
-    [Column("wafer_y_reset_velocity"), Description("晶圆Y轴回原速度")]
+    [Column("wafer_y_reset_velocity"), Description("晶圆Y轴回原速度"),
+     Property(Group = "WaferY", Variable = "axisVel", Axis = 0, Index = 1)]
     public int WaferYResetVelocity { get; set; }
 
-    [Column("wafer_y_reset_acceleration"), Description("晶圆Y轴回原加速度")]
+    [Column("wafer_y_reset_acceleration"), Description("晶圆Y轴回原加速度"),
+     Property(Group = "WaferY", Variable = "axisAcc", Axis = 0, Index = 1)]
     public int WaferYResetAcceleration { get; set; }
 
-    [Column("wafer_y_reset_deceleration"), Description("晶圆Y轴回原减速度")]
+    [Column("wafer_y_reset_deceleration"), Description("晶圆Y轴回原减速度"),
+     Property(Group = "WaferY", Variable = "axisDec", Axis = 0, Index = 1)]
     public int WaferYResetDeceleration { get; set; }
 
-    [Column("wafer_y_reset_jerk"), Description("晶圆Y轴回原加加速度")]
+    [Column("wafer_y_reset_jerk"), Description("晶圆Y轴回原加加速度"),
+     Property(Group = "WaferY", Variable = "axisJerk", Axis = 0, Index = 1)]
     public int WaferYResetJerk { get; set; }
 
-    [Column("needle_y_auto_velocity"), Description("针刺Y轴自动速度")]
+    [Column("needle_y_auto_velocity"), Description("针刺Y轴自动速度"),
+     Property(Group = "NeedleY", Variable = "axisVel", Axis = 2, Index = 0)]
     public int NeedleYAutoVelocity { get; set; }
 
-    [Column("needle_y_auto_acceleration"), Description("针刺Y轴自动加速度")]
+    [Column("needle_y_auto_acceleration"), Description("针刺Y轴自动加速度"),
+     Property(Group = "NeedleY", Variable = "axisAcc", Axis = 2, Index = 0)]
     public int NeedleYAutoAcceleration { get; set; }
 
-    [Column("needle_y_auto_deceleration"), Description("针刺Y轴自动减速度")]
+    [Column("needle_y_auto_deceleration"), Description("针刺Y轴自动减速度"),
+     Property(Group = "NeedleY", Variable = "axisDec", Axis = 2, Index = 0)]
     public int NeedleYAutoDeceleration { get; set; }
 
-    [Column("needle_y_auto_jerk"), Description("针刺Y轴自动加加速度")]
+    [Column("needle_y_auto_jerk"), Description("针刺Y轴自动加加速度"),
+     Property(Group = "NeedleY", Variable = "axisJerk", Axis = 2, Index = 0)]
     public int NeedleYAutoJerk { get; set; }
 
-    [Column("needle_y_reset_velocity"), Description("针刺Y轴回原速度")]
+    [Column("needle_y_reset_velocity"), Description("针刺Y轴回原速度"),
+     Property(Group = "NeedleY", Variable = "axisVel", Axis = 2, Index = 1)]
     public int NeedleYResetVelocity { get; set; }
 
-    [Column("needle_y_reset_acceleration"), Description("针刺Y轴回原加速度")]
+    [Column("needle_y_reset_acceleration"), Description("针刺Y轴回原加速度"),
+     Property(Group = "NeedleY", Variable = "axisAcc", Axis = 2, Index = 1)]
     public int NeedleYResetAcceleration { get; set; }
 
-    [Column("needle_y_reset_deceleration"), Description("针刺Y轴回原减速度")]
+    [Column("needle_y_reset_deceleration"), Description("针刺Y轴回原减速度"),
+     Property(Group = "NeedleY", Variable = "axisDec", Axis = 2, Index = 1)]
     public int NeedleYResetDeceleration { get; set; }
 
-    [Column("needle_y_reset_jerk"), Description("针刺Y轴回原加加速度")]
+    [Column("needle_y_reset_jerk"), Description("针刺Y轴回原加加速度"),
+     Property(Group = "NeedleY", Variable = "axisJerk", Axis = 2, Index = 1)]
     public int NeedleYResetJerk { get; set; }
 
-    [Column("wafer_x_auto_velocity"), Description("晶圆X轴自动速度")]
+    [Column("wafer_x_auto_velocity"), Description("晶圆X轴自动速度"),
+     Property(Group = "WaferX", Variable = "axisVel", Axis = 4, Index = 0)]
     public int WaferXAutoVelocity { get; set; }
 
-    [Column("wafer_x_auto_acceleration"), Description("晶圆X轴自动加速度")]
+    [Column("wafer_x_auto_acceleration"), Description("晶圆X轴自动加速度"),
+     Property(Group = "WaferX", Variable = "axisAcc", Axis = 4, Index = 0)]
     public int WaferXAutoAcceleration { get; set; }
 
-    [Column("wafer_x_auto_deceleration"), Description("晶圆X轴自动减速度")]
+    [Column("wafer_x_auto_deceleration"), Description("晶圆X轴自动减速度"),
+     Property(Group = "WaferX", Variable = "axisDec", Axis = 4, Index = 0)]
     public int WaferXAutoDeceleration { get; set; }
 
-    [Column("wafer_x_auto_jerk"), Description("晶圆X轴自动加加速度")]
+    [Column("wafer_x_auto_jerk"), Description("晶圆X轴自动加加速度"),
+     Property(Group = "WaferX", Variable = "axisJerk", Axis = 4, Index = 0)]
     public int WaferXAutoJerk { get; set; }
 
-    [Column("wafer_x_reset_velocity"), Description("晶圆X回原速度")]
+    [Column("wafer_x_reset_velocity"), Description("晶圆X回原速度"),
+     Property(Group = "WaferX", Variable = "axisVel", Axis = 4, Index = 1)]
     public int WaferXResetVelocity { get; set; }
 
-    [Column("wafer_x_reset_acceleration"), Description("晶圆X轴回原加速度")]
+    [Column("wafer_x_reset_acceleration"), Description("晶圆X轴回原加速度"),
+     Property(Group = "WaferX", Variable = "axisAcc", Axis = 4, Index = 1)]
     public int WaferXResetAcceleration { get; set; }
 
-    [Column("wafer_x_reset_deceleration"), Description("晶圆X轴回原减速度")]
+    [Column("wafer_x_reset_deceleration"), Description("晶圆X轴回原减速度"),
+     Property(Group = "WaferX", Variable = "axisDec", Axis = 4, Index = 1)]
     public int WaferXResetDeceleration { get; set; }
 
-    [Column("wafer_x_reset_jerk"), Description("晶圆X轴回原加加速度")]
+    [Column("wafer_x_reset_jerk"), Description("晶圆X轴回原加加速度"),
+     Property(Group = "WaferX", Variable = "axisJerk", Axis = 4, Index = 1)]
     public int WaferXResetJerk { get; set; }
 
-    [Column("needle_x_auto_velocity"), Description("针刺X轴自动速度")]
+    [Column("needle_x_auto_velocity"), Description("针刺X轴自动速度"),
+     Property(Group = "NeedleX", Variable = "axisVel", Axis = 5, Index = 0)]
     public int NeedleXAutoVelocity { get; set; }
 
-    [Column("needle_x_auto_acceleration"), Description("针刺X轴自动加速度")]
+    [Column("needle_x_auto_acceleration"), Description("针刺X轴自动加速度"),
+     Property(Group = "NeedleX", Variable = "axisAcc", Axis = 5, Index = 0)]
     public int NeedleXAutoAcceleration { get; set; }
 
-    [Column("needle_x_auto_deceleration"), Description("针刺X轴自动减速度")]
+    [Column("needle_x_auto_deceleration"), Description("针刺X轴自动减速度"),
+     Property(Group = "NeedleX", Variable = "axisDec", Axis = 5, Index = 0)]
     public int NeedleXAutoDeceleration { get; set; }
 
-    [Column("needle_x_auto_jerk"), Description("针刺X轴自动加加速度")]
+    [Column("needle_x_auto_jerk"), Description("针刺X轴自动加加速度"),
+     Property(Group = "NeedleX", Variable = "axisJerk", Axis = 5, Index = 0)]
     public int NeedleXAutoJerk { get; set; }
 
 
-    [Column("needle_x_reset_velocity"), Description("针刺X回原速度")]
+    [Column("needle_x_reset_velocity"), Description("针刺X回原速度"),
+     Property(Group = "NeedleX", Variable = "axisVel", Axis = 5, Index = 1)]
     public int NeedleXResetVelocity { get; set; }
 
-    [Column("needle_x_reset_acceleration"), Description("针刺X轴回原加速度")]
+    [Column("needle_x_reset_acceleration"), Description("针刺X轴回原加速度"),
+     Property(Group = "NeedleX", Variable = "axisAcc", Axis = 5, Index = 1)]
     public int NeedleXResetAcceleration { get; set; }
 
-    [Column("needle_x_reset_deceleration"), Description("针刺X轴回原减速度")]
+    [Column("needle_x_reset_deceleration"), Description("针刺X轴回原减速度"),
+     Property(Group = "NeedleX", Variable = "axisDec", Axis = 5, Index = 1)]
     public int NeedleXResetDeceleration { get; set; }
 
-    [Column("needle_x_reset_jerk"), Description("针刺X轴回原加加速度")]
+    [Column("needle_x_reset_jerk"), Description("针刺X轴回原加加速度"),
+     Property(Group = "NeedleX", Variable = "axisJerk", Axis = 5, Index = 1)]
     public int NeedleXResetJerk { get; set; }
 
     [Column("wafer_x2_auto_velocity"), Description("晶圆X2轴自动速度"),
@@ -248,133 +395,178 @@ public class AxisVariables : Entity
      Property(Group = "NeedleZ", Variable = "axisJerk", Axis = 9, Index = 1)]
     public int NeedleZServoResetJerk { get; set; }
 
-    [Column("wafer_z_servo_auto_velocity"), Description("晶环升降伺服自动速度"),
-     Property(Group = "WaferZ", Variable = "axisVel", Axis = 10, Index = 0)]
-    public int WaferZServoAutoVelocity { get; set; }
-
-    [Column("wafer_z_servo_auto_acceleration"), Description("晶环升降伺服自动加速度"),
-     Property(Group = "WaferZ", Variable = "axisAcc", Axis = 10, Index = 0)]
-    public int WaferZServoAutoAcceleration { get; set; }
-
-    [Column("wafer_z_servo_auto_deceleration"), Description("晶环升降伺服自动减速度"),
-     Property(Group = "WaferZ", Variable = "axisDec", Axis = 10, Index = 0)]
-    public int WaferZServoAutoDeceleration { get; set; }
-
-    [Column("wafer_z_servo_auto_jerk"), Description("晶环升降伺服自动加加速度"),
-     Property(Group = "WaferZ", Variable = "axisJerk", Axis = 10, Index = 0)]
-    public int WaferZServoAutoJerk { get; set; }
-
-    [Column("wafer_z_servo_reset_velocity"), Description("晶环升降伺服回原速度"),
-     Property(Group = "WaferZ", Variable = "axisVel", Axis = 10, Index = 1)]
-    public int WaferZServoResetVelocity { get; set; }
-
-    [Column("wafer_z_servo_reset_acceleration"), Description("晶环升降伺服回原加速度"),
-     Property(Group = "WaferZ", Variable = "axisAcc", Axis = 10, Index = 1)]
-    public int WaferZServoResetAcceleration { get; set; }
-
-    [Column("wafer_z_servo_reset_deceleration"), Description("晶环升降伺服回原减速度"),
-     Property(Group = "WaferZ", Variable = "axisDec", Axis = 10, Index = 1)]
-    public int WaferZServoResetDeceleration { get; set; }
-
-    [Column("wafer_z_servo_reset_jerk"), Description("晶环升降伺服回原加加速度"),
-     Property(Group = "WaferZ", Variable = "axisJerk", Axis = 10, Index = 1)]
-    public int WaferZServoResetJerk { get; set; }
-
 
     [Column("wafer_rotate_servo_auto_velocity"), Description("晶环旋转伺服自动速度"),
-     Property(Group = "WaferRotate", Variable = "axisVel", Axis = 11, Index = 0)]
+     Property(Group = "WaferRotate", Variable = "axisVel", Axis = 10, Index = 0)]
     public int WaferRotateServoAutoVelocity { get; set; }
 
     [Column("wafer_rotate_servo_auto_acceleration"), Description("晶环旋转伺服自动加速度"),
-     Property(Group = "WaferRotate", Variable = "axisAcc", Axis = 11, Index = 0)]
+     Property(Group = "WaferRotate", Variable = "axisAcc", Axis = 10, Index = 0)]
     public int WaferRotateServoAutoAcceleration { get; set; }
 
     [Column("wafer_rotate_servo_auto_deceleration"), Description("晶环旋转伺服自动减速度"),
-     Property(Group = "WaferRotate", Variable = "axisDec", Axis = 11, Index = 0)]
+     Property(Group = "WaferRotate", Variable = "axisDec", Axis = 10, Index = 0)]
     public int WaferRotateServoAutoDeceleration { get; set; }
 
     [Column("wafer_rotate_servo_auto_jerk"), Description("晶环旋转伺服自动加加速度"),
-     Property(Group = "WaferRotate", Variable = "axisJerk", Axis = 11, Index = 0)]
+     Property(Group = "WaferRotate", Variable = "axisJerk", Axis = 10, Index = 0)]
     public int WaferRotateServoAutoJerk { get; set; }
 
     [Column("wafer_rotate_servo_reset_velocity"), Description("晶环旋转伺服回原速度"),
-     Property(Group = "WaferRotate", Variable = "axisVel", Axis = 11, Index = 1)]
+     Property(Group = "WaferRotate", Variable = "axisVel", Axis = 10, Index = 1)]
     public int WaferRotateServoResetVelocity { get; set; }
 
     [Column("wafer_rotate_servo_reset_acceleration"), Description("晶环旋转伺服回原加速度"),
-     Property(Group = "WaferRotate", Variable = "axisAcc", Axis = 11, Index = 1)]
+     Property(Group = "WaferRotate", Variable = "axisAcc", Axis = 10, Index = 1)]
     public int WaferRotateServoResetAcceleration { get; set; }
 
     [Column("wafer_rotate_servo_reset_deceleration"), Description("晶环旋转伺服回原减速度"),
-     Property(Group = "WaferRotate", Variable = "axisDec", Axis = 11, Index = 1)]
+     Property(Group = "WaferRotate", Variable = "axisDec", Axis = 10, Index = 1)]
     public int WaferRotateServoResetDeceleration { get; set; }
 
     [Column("wafer_rotate_servo_reset_jerk"), Description("晶环旋转伺服回原加加速度"),
-     Property(Group = "WaferRotate", Variable = "axisJerk", Axis = 11, Index = 1)]
+     Property(Group = "WaferRotate", Variable = "axisJerk", Axis = 10, Index = 1)]
     public int WaferRotateServoResetJerk { get; set; }
 
     [Column("wafer_up_down_servo_auto_velocity"), Description("晶环上料升降步进自动速度"),
-     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 12, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 11, Index = 0)]
     public int WaferUpDownServoAutoVelocity { get; set; }
 
     [Column("wafer_up_down_servo_auto_acceleration"), Description("晶环上料升降步进自动加速度"),
-     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 12, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 11, Index = 0)]
     public int WaferUpDownServoAutoAcceleration { get; set; }
 
     [Column("wafer_up_down_servo_auto_deceleration"), Description("晶环上料升降步进自动减速度"),
-     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 12, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 11, Index = 0)]
     public int WaferUpDownServoAutoDeceleration { get; set; }
 
     [Column("wafer_up_down_servo_auto_jerk"), Description("晶环上料升降步进自动加加速度"),
-     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 12, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 11, Index = 0)]
     public int WaferUpDownServoAutoJerk { get; set; }
 
     [Column("wafer_up_down_servo_reset_velocity"), Description("晶环上料升降步进回原速度"),
-     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 12, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 11, Index = 1)]
     public int WaferUpDownServoResetVelocity { get; set; }
 
     [Column("wafer_up_down_servo_reset_acceleration"), Description("晶环上料升降步进回原加速度"),
-     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 12, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 11, Index = 1)]
     public int WaferUpDownServoResetAcceleration { get; set; }
 
     [Column("wafer_up_down_servo_reset_deceleration"), Description("晶环上料升降步进回原减速度"),
-     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 12, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 11, Index = 1)]
     public int WaferUpDownServoResetDeceleration { get; set; }
 
     [Column("wafer_up_down_servo_reset_jerk"), Description("晶环上料升降步进回原加加速度"),
-     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 12, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 11, Index = 1)]
     public int WaferUpDownServoResetJerk { get; set; }
 
     [Column("wafer_translation_servo_auto_velocity"), Description("晶环上料平移步进自动速度"),
-     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 13, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 12, Index = 0)]
     public int WaferTranslationServoAutoVelocity { get; set; }
 
     [Column("wafer_translation_servo_auto_acceleration"), Description("晶环上料平移步进自动加速度"),
-     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 13, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 12, Index = 0)]
     public int WaferTranslationServoAutoAcceleration { get; set; }
 
     [Column("wafer_translation_servo_auto_deceleration"), Description("晶环上料平移步进自动减速度"),
-     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 13, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 12, Index = 0)]
     public int WaferTranslationServoAutoDeceleration { get; set; }
 
     [Column("wafer_translation_servo_auto_jerk"), Description("晶环上料平移步进自动加加速度"),
-     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 13, Index = 0)]
+     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 12, Index = 0)]
     public int WaferTranslationServoAutoJerk { get; set; }
 
 
     [Column("wafer_translation_servo_reset_velocity"), Description("晶环上料平移步进回原速度"),
-     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 13, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisVel", Axis = 12, Index = 1)]
     public int WaferTranslationServoResetVelocity { get; set; }
 
     [Column("wafer_translation_servo_acceleration"), Description("晶环上料平移步进回原加速度"),
-     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 13, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisAcc", Axis = 12, Index = 1)]
     public int WaferTranslationServoAcceleration { get; set; }
 
     [Column("wafer_translation_servo_deceleration"), Description("晶环上料平移步进回原减速度"),
-     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 13, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisDec", Axis = 12, Index = 1)]
     public int WaferTranslationServoDeceleration { get; set; }
 
     [Column("wafer_translation_servo_reset_jerk"), Description("晶环上料平移步进回原加加速度"),
-     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 13, Index = 1)]
+     Property(Group = "WaferLoading", Variable = "axisJerk", Axis = 12, Index = 1)]
     public int WaferTranslationServoResetJerk { get; set; }
+
+    [Column("wafer_loading_z_offset"), Description("料盒取料升降避让偏移量"),
+     Property(Group = "WaferLoading", Variable = "iBinLoadZOffset")]
+    public double WaferLoadingZOffset { get; set; }
+
+
+    [Column("wafer_y_motor_origin_offset"), Description("晶片Y轴回源偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 0)]
+    public double WaferYMotorOriginOffset { get; set; }
+
+    [Column("wafer_y_slave_motor_origin_offset"), Description("晶圆Y轴电机从轴回源偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 1)]
+    public double WaferYSlaveMotorOriginOffset { get; set; }
+
+    [Column("needle_y_motor_origin_offset"), Description("针刺Y轴回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 2)]
+    public double NeedleYMotorOriginOffset { get; set; }
+
+    [Column("needle_y_slave_motor_origin_offset"), Description("针刺Y轴从轴回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 3)]
+    public double NeedleYSlaveMotorOriginOffset { get; set; }
+
+    [Column("wafer_x_motor1_origin_offset"), Description("晶园X轴电机回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 4)]
+    public double WaferXMotor1OriginOffset { get; set; }
+
+    [Column("needle_x_motor1_origin_offset"), Description("针刺X轴电机回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 5)]
+    public double NeedleXMotor1OriginOffset { get; set; }
+
+    [Column("wafer_x_motor2_origin_offset"), Description("晶圆X轴电机从轴回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 6)]
+    public double WaferXMotor2OriginOffset { get; set; }
+
+    [Column("needle_x_motor2_origin_offset"), Description("针刺X轴电机从轴回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 7)]
+    public double NeedleXMotor2OriginOffset { get; set; }
+
+    [Column("needle_z_motor_origin_offset"), Description("针刺Z轴电机回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 8)]
+    public double NeedleZMotorOriginOffset { get; set; }
+
+    [Column("needle_z_servo_origin_offset"), Description("针刺Z轴私服回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 9)]
+    public double NeedleZServoOriginOffset { get; set; }
+
+    [Column("wafer_rotate_servo_origin_offset"), Description(" 晶膜旋转伺服回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 10)]
+    public double WaferRotateServoOriginOffset { get; set; }
+
+    [Column("wafer_up_down_servo_origin_offset"), Description("晶片上下升降伺服回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 11)]
+    public double WaferUpDownServoOriginOffset { get; set; }
+
+    [Column("wafer_translation_servo_origin_offset"), Description("晶片平移伺服回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 12)]
+    public double WaferTranslationServoOriginOffset { get; set; }
+
+    [Column("substrate_location_servo_origin_offset"), Description("基板定位步进电机回原偏移量"),
+     Property(Group = "OriginOffset", Variable = "stAxisOriginOffset", Axis = 13)]
+    public double SubstrateLocationServoOriginOffset { get; set; }
+
+    [Column("y_motor_ran_limit_space"), Description("横梁干涉限位"),
+     Property(Group = "RanLimitSpace", Variable = "stRANLimitSpace", Index = 0)]
+    public double YMotorRanLimitSpace { get; set; }
+
+    [Column("needle_y_and_wafer_y_ran_limit_space"), Description("针刺Y和晶圆Y旋转干涉限位"),
+     Property(Group = "RanLimitSpace", Variable = "stRANLimitSpace", Index = 1)]
+    public double NeedleYAndWaferYRanLimitSpace { get; set; }
+
+    [Column("wafer_x_and_needle_x_ran_limit_space"), Description("晶圆X和针刺X旋转干涉限位"),
+     Property(Group = "RanLimitSpace", Variable = "stRANLimitSpace", Index = 2)]
+    public double WaferXMotorAndNeedleXMotorRanLimitSpace { get; set; }
+
+    [Column("needle_z_and_needle_z_servo_ran_limit_space"), Description("音圈Z和私服Z旋转干涉限位"),
+     Property(Group = "RanLimitSpace", Variable = "stRANLimitSpace", Index = 3)]
+    public double NeedleZAndNeedleZServoRanLimitSpace { get; set; }
 }

MasstransferExporter/DataExporter/Model/FormulaDTO.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using MasstransferCore.Model.Entity;
 
 namespace MasstransferExporter.DataExporter.Model;
 

MasstransferExporter/DataExporter/StrikeRecordService.cs

@@ -2,8 +2,6 @@
 using MasstransferCommunicate.Mqtt.Client;
 using MasstransferExporter.DataExporter.Model;
 using MasstransferInfrastructure.Database.Sqlite;
-using Masuit.Tools;
-using Substrate = MasstransferCommon.Model.Entity.Substrate;
 
 namespace MasstransferExporter.DataExporter;
 

MasstransferExporter/ImageExporter/ImageService.cs

@@ -89,7 +89,7 @@ public class ImageService : Instant
                             }
 
                             // 上传文件
-                            var fileName = $"{Constants.SN}/{codeDir.Name}/{batchDir.Name}/{picType}/{name}";
+                            var fileName = $"{Constants.SN}/{codeDir.Name}/{batchDir.Name}/{picType.ToUpper()}/{name}";
 
                             await Minio.UploadFileAsync(bucket, fileName, path);
 

MasstransferExporter/LogExporter/LogFileExporter.cs

@@ -1,4 +1,5 @@
-using MasstransferCommon.Events;
+using MasstransferCommon.Atrributes;
+using MasstransferCommon.Events;
 using MasstransferCommon.Model.Constant;
 using MasstransferCommon.Model.Entity;
 using MasstransferCommon.Utils;
@@ -9,7 +10,7 @@ using MasstransferInfrastructure.Database.Sqlite;
 
 namespace MasstransferExporter.LogExporter;
 
-public class LogFileExporter
+public class LogFileExporter : Instant
 {
     private static readonly SqliteHelper Helper = SqliteHelper.GetInstance();
 
@@ -18,15 +19,10 @@ public class LogFileExporter
     private static readonly MinioHelper Minio = MinioHelper.GetInstance();
 
 
-    static LogFileExporter()
-    {
-        EventBus<bool>.AddEventHandler(EventType.StartUp, async () => { await ListenQueryLogEvent(); });
-    }
-
     /// <summary>
     /// 监听查询日志事件
     /// </summary>
-    private static async Task ListenQueryLogEvent()
+    private static async Task ListenQueryLogEvent(EventType type, bool start)
     {
         await MessageQueueHelper.Subscribe(Topics.QueryLogFile, HandleQueryLogEvent);
     }
@@ -34,13 +30,9 @@ public class LogFileExporter
     /// <summary>
     /// 处理查询日志的请求事件
     /// </summary>
-    private static async Task HandleQueryLogEvent(string topic, string payload)
+    private static async Task HandleQueryLogEvent(string topic, QueryLogDTO? dto)
     {
-        if (payload == null) return;
+        if (dto == null) return;
-
-        var queryLogDto = JsonUtil.FromJson<QueryLogDTO>(payload);
-
-        if (queryLogDto == null) return;
 
         var path =
             "C:\\workspace\\code_repos\\haiju\\MasstransferHost\\MasstransferDesktop\\bin\\Debug\\net7.0";
@@ -49,12 +41,12 @@ public class LogFileExporter
 
         List<FileInfo> files = [];
 
-        FilterLogFiles(directory, queryLogDto.Module, queryLogDto.StartTime, queryLogDto.EndTime, files);
+        FilterLogFiles(directory, dto.Module, dto.StartTime, dto.EndTime, files);
 
         foreach (var file in files)
         {
             var fileName =
-                $"{Constants.SN}/{TimeUtil.FormatTime(file.CreationTime, "yyyyMMdd")}/{queryLogDto.Module}/{file.Name}";
+                $"{Constants.SN}/{TimeUtil.FormatTime(file.CreationTime, "yyyyMMdd")}/{dto.Module}/{file.Name}";
 
             await Minio.UploadFileAsync("log", fileName, file.FullName);
         }
@@ -112,7 +104,7 @@ public class LogFileExporter
     /// <summary>
     ///     重新加载日志文件列表
     /// </summary>
-    private static void FilterLogFiles(DirectoryInfo directory, string level, long startTime, long endTime,
+    private static void FilterLogFiles(DirectoryInfo directory, string level, DateTime startTime, DateTime endTime,
         List<FileInfo> files)
     {
         // 获取文件夹下所有文件的信息
@@ -125,13 +117,15 @@ public class LogFileExporter
             return;
         }
 
-        var start = TimeUtil.ConvertTime(startTime);
-        var end = TimeUtil.ConvertTime(endTime);
-
         // 遍历所有文件
-        files.AddRange(fs.Where(f => f.CreationTime >= start && f.CreationTime <= end));
+        files.AddRange(fs.Where(f => f.CreationTime >= startTime && f.CreationTime <= endTime));
 
         // 递归遍历当前目录下的所有文件夹
         foreach (var subdir in directory.GetDirectories()) FilterLogFiles(subdir, level, startTime, endTime, files);
     }
+
+    public void Initialized()
+    {
+        EventBus<bool>.AddEventHandler(EventType.StartUp, ListenQueryLogEvent);
+    }
 }

MasstransferExporter/LogExporter/Model/QueryLogDTO.cs

@@ -1,13 +1,15 @@
-namespace MasstransferExporter.LogExporter.Model;
+using Newtonsoft.Json;
+
+namespace MasstransferExporter.LogExporter.Model;
 
 /// <summary>
 /// 查询日志请求
 /// </summary>
 public class QueryLogDTO
 {
-    public long StartTime { get; set; }
+    [JsonProperty("startTime")] public DateTime StartTime { get; set; }
 
-    public long EndTime { get; set; }
+    [JsonProperty("endTime")] public DateTime EndTime { get; set; }
 
-    public string Module { get; set; }
+    [JsonProperty("module")] public string Module { get; set; }
 }