Merge branch 'master' of http://192.168.1.3:3000/project_boditech_vidas_a8000_v3/a8k_app

src/main/java/a8k/service/db/dao/SamplesPreProcessModuleParameterDao.java

@@ -0,0 +1,12 @@
+package a8k.service.db.dao;
+
+import a8k.service.db.entity.SamplesPreProcessModuleParameter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SamplesPreProcessModuleParameterDao {
+		public SamplesPreProcessModuleParameter getParameter() {
+		//TODO:
+		return null;
+	}
+}

src/main/java/a8k/service/db/entity/MotorTubeRackMoveCtrlServiceParameter.java

@@ -34,6 +34,16 @@ public class MotorTubeRackMoveCtrlServiceParameter {
 	@UfActiveRecordField
 	Integer horizontalMotorOffset; //水平移动电机位置偏移
 
+	@UfActiveRecordField
+	Integer horizontalMotorLostStepThresholdVal; //水平电机丢步判断
+
+	@UfActiveRecordField
+	Integer scanCodeClampPos; //试管扫码夹紧位置
+
+	@UfActiveRecordField
+	Integer scanCodeReleasePos;//试管扫码释放位置
+
+
 	public static String getTableName() {
 		return "MotorTubeRackMoveCtrlServiceParameter" + "Table";
 	}

src/main/java/a8k/service/db/entity/SamplesPreProcessModuleParameter.java

@@ -0,0 +1,62 @@
+package a8k.service.db.entity;
+
+import com.iflytop.uf.UfActiveRecord;
+import com.iflytop.uf.UfActiveRecordField;
+
+public class SamplesPreProcessModuleParameter {
+	/**
+	 * 升降电机相关位置
+	 */
+	@UfActiveRecordField
+	public Integer highBlood_TakeCapPos;//高全血试管取帽位置
+
+	@UfActiveRecordField
+	public Integer shortBlood_TakeCapPos;//矮全血试管取帽位置
+
+	@UfActiveRecordField
+	public Integer elevating_MotorPosOffset;//升降电机位置偏移
+
+	/**
+	 * 水平移动电机
+	 */
+	@UfActiveRecordField
+	public Integer horizontalMotor_standbyPos;//水平移动电机，待机位置
+
+	@UfActiveRecordField
+	public Integer horizontalMotor_takeCapPos; //水平移动电机，取帽位置
+
+	@UfActiveRecordField
+	public Integer horizontalMotor_takePushCapPos; //水平移动电机，放帽位置
+
+	/**
+	 * 取帽舵机
+	 */
+	@UfActiveRecordField
+	public Integer takeCapServo_standbyPos; //取帽舵机，待机位置
+
+	@UfActiveRecordField
+	public Integer takeCapServo_takeCapTorque; //取帽舵机，取帽扭矩
+
+	@UfActiveRecordField
+	public Integer takeCapServo_takeTubePos; // 取帽舵机，取试管位置
+
+	/**
+	 * 摇匀电机
+	 */
+	@UfActiveRecordField
+	public Integer shakeMotor_standbyPos;
+	@UfActiveRecordField
+	public Integer shakeMotor_shakeDegree;
+
+	/**
+	 * 夹紧电机
+	 */
+	@UfActiveRecordField
+	public Integer tubeClampMotor_standbyPos;
+	@UfActiveRecordField
+	public Integer tubeClampMotor_ClampPos;
+
+	public static String getTableName() {
+		return "SamplesPreProcessModuleParameter" + "Table";
+	}
+}