绝缘耐压列表数据,绑定逻辑优化

src/main/java/com/jeesite/modules/mes/dao/MesProductVoltageDao.java

@@ -0,0 +1,15 @@
+package com.jeesite.modules.mes.dao;
+
+import com.jeesite.common.dao.CrudDao;
+import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import com.jeesite.modules.mes.entity.MesProductVoltage;
+
+/**
+ * 绝缘电压数据表DAO接口
+ * @author sxl
+ * @version 2026-08-15
+ */
+@MyBatisDao
+public interface MesProductVoltageDao extends CrudDao<MesProductVoltage> {
+	
+}

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

@@ -0,0 +1,121 @@
+package com.jeesite.modules.mes.entity;
+
+import javax.validation.constraints.Size;
+
+import com.jeesite.common.entity.DataEntity;
+import com.jeesite.common.mybatis.annotation.Column;
+import com.jeesite.common.mybatis.annotation.Table;
+import com.jeesite.common.mybatis.mapper.query.QueryType;
+
+/**
+ * 绝缘电压数据表Entity
+ * @author sxl
+ * @version 2026-08-15
+ */
+@Table(name="mes_product_voltage", alias="a", label="绝缘电压数据表信息", columns={
+		@Column(name="id", attrName="id", label="id", isPK=true),
+		@Column(name="sn", attrName="sn", label="工件码"),
+		@Column(name="current", attrName="current", label="检测电流"),
+		@Column(name="current_ps", attrName="currentPs", label="爬升电流"),
+		@Column(name="one_voltage", attrName="oneVoltage", label="电压1"),
+		@Column(name="two_voltage", attrName="twoVoltage", label="电压2"),
+		@Column(name="resistance", attrName="resistance", label="电阻"),
+		@Column(name="result", attrName="result", label="检测结果"),
+		@Column(name="time", attrName="time", label="检测次数"),
+		@Column(name="create_by", attrName="createBy", label="创建人", isUpdate=false, isQuery=false),
+		@Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isQuery=false, isUpdateForce=true),
+	}, orderBy="a.id DESC"
+)
+public class MesProductVoltage extends DataEntity<MesProductVoltage> {
+	
+	private static final long serialVersionUID = 1L;
+	private String sn;		// 工件码
+	private String current;		// 检测电流
+	private String currentPs;		// 爬升电流
+	private String oneVoltage;		// 电压1
+	private String twoVoltage;		// 电压2
+	private String resistance;		// 电阻
+	private String result;		// 检测结果
+	private String time;		// 检测次数
+
+	public MesProductVoltage() {
+		this(null);
+	}
+	
+	public MesProductVoltage(String id){
+		super(id);
+	}
+	
+	@Size(min=0, max=64, message="工件码长度不能超过 64 个字符")
+	public String getSn() {
+		return sn;
+	}
+
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+	
+	@Size(min=0, max=64, message="检测电流长度不能超过 64 个字符")
+	public String getCurrent() {
+		return current;
+	}
+
+	public void setCurrent(String current) {
+		this.current = current;
+	}
+	
+	@Size(min=0, max=64, message="爬升电流长度不能超过 64 个字符")
+	public String getCurrentPs() {
+		return currentPs;
+	}
+
+	public void setCurrentPs(String currentPs) {
+		this.currentPs = currentPs;
+	}
+	
+	@Size(min=0, max=64, message="电压1长度不能超过 64 个字符")
+	public String getOneVoltage() {
+		return oneVoltage;
+	}
+
+	public void setOneVoltage(String oneVoltage) {
+		this.oneVoltage = oneVoltage;
+	}
+	
+	@Size(min=0, max=64, message="电压2长度不能超过 64 个字符")
+	public String getTwoVoltage() {
+		return twoVoltage;
+	}
+
+	public void setTwoVoltage(String twoVoltage) {
+		this.twoVoltage = twoVoltage;
+	}
+	
+	@Size(min=0, max=64, message="电阻长度不能超过 64 个字符")
+	public String getResistance() {
+		return resistance;
+	}
+
+	public void setResistance(String resistance) {
+		this.resistance = resistance;
+	}
+	
+	@Size(min=0, max=64, message="检测结果长度不能超过 64 个字符")
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+	
+	@Size(min=0, max=64, message="检测次数长度不能超过 64 个字符")
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(String time) {
+		this.time = time;
+	}
+	
+}

src/main/java/com/jeesite/modules/mes/service/MesMoldMaintenancePlanService.java

@@ -28,10 +28,10 @@ public class MesMoldMaintenancePlanService extends CrudService<MesMoldMaintenanc
 	private static final Logger log = LoggerFactory.getLogger(MesMoldMaintenancePlanService.class);
 
 	// TODO: 请在此处填写接收预警短信的手机号（多个用英文逗号分隔）
-	private static final String SMS_PHONE_NUMBERS = "17203891886";
+	private static final String SMS_PHONE_NUMBERS = "18461071125";
 
 	// 短信发送开关：true允许发送，发送成功后置为false，执行保养后置为true
-	private static volatile boolean smsAlertEnabled = true;
+	private static volatile boolean smsAlertEnabled = false;
 
 	@Autowired
 	private MesMoldMaintenanceItemDao mesMoldMaintenanceItemDao;

src/main/java/com/jeesite/modules/mes/service/MesProductVoltageService.java

@@ -0,0 +1,81 @@
+package com.jeesite.modules.mes.service;
+
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.service.CrudService;
+import com.jeesite.modules.mes.entity.MesProductVoltage;
+import com.jeesite.modules.mes.dao.MesProductVoltageDao;
+
+/**
+ * 绝缘电压数据表Service
+ * @author sxl
+ * @version 2026-08-15
+ */
+@Service
+public class MesProductVoltageService extends CrudService<MesProductVoltageDao, MesProductVoltage> {
+	
+	/**
+	 * 获取单条数据
+	 * @param mesProductVoltage
+	 * @return
+	 */
+	@Override
+	public MesProductVoltage get(MesProductVoltage mesProductVoltage) {
+		return super.get(mesProductVoltage);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesProductVoltage 查询条件
+	 * @param mesProductVoltage.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesProductVoltage> findPage(MesProductVoltage mesProductVoltage) {
+		return super.findPage(mesProductVoltage);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesProductVoltage
+	 * @return
+	 */
+	@Override
+	public List<MesProductVoltage> findList(MesProductVoltage mesProductVoltage) {
+		return super.findList(mesProductVoltage);
+	}
+	
+	/**
+	 * 保存数据（插入或更新）
+	 * @param mesProductVoltage
+	 */
+	@Override
+	@Transactional
+	public void save(MesProductVoltage mesProductVoltage) {
+		super.save(mesProductVoltage);
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesProductVoltage
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesProductVoltage mesProductVoltage) {
+		super.updateStatus(mesProductVoltage);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesProductVoltage
+	 */
+	@Override
+	@Transactional
+	public void delete(MesProductVoltage mesProductVoltage) {
+		super.delete(mesProductVoltage);
+	}
+	
+}

src/main/java/com/jeesite/modules/mes/web/MesOrderSnController.java

@@ -130,7 +130,7 @@ public class MesOrderSnController extends BaseController {
 	}
 
 	/**
-	 * 生产订单绑定工件码（OP110 工位质量校验通过后方可绑定；绑定成功后提交 OP100 工位结果为 OK）
+	 * 生产订单绑定工件码（OP100 工位质量校验通过后方可绑定；绑定成功后提交 OP100 工位结果为 OK）
 	 * @param mesOrderSn
 	 * @return
 	 */
@@ -163,13 +163,13 @@ public class MesOrderSnController extends BaseController {
 		}
 		String lineSn = lineInfo.getSn();
 
-		// OP110 质量校验（按子工位 OP110A）；允许本工位已加工（OK/NG）时仍可绑定订单
+		// OP100 质量校验（按子工位 OP100A）；允许本工位已加工（OK/NG）时仍可绑定订单
 		String userCode = "";
 		User user = UserUtils.getUser();
 		if (user != null && StringUtils.isNotEmpty(user.getUserCode())) {
 			userCode = user.getUserCode();
 		}
-		String ret = mesProductRecordController.checkQualityCommon("OP110A", sn, lineSn, userCode);
+		String ret = mesProductRecordController.checkQualityCommon("OP100A", sn, lineSn, userCode);
 		String checkret = ret.substring(3, 5);
 		if (!"UD".equals(checkret) && !"OK".equalsIgnoreCase(checkret) && !"NG".equalsIgnoreCase(checkret)) {
 			String lx = ret.substring(0, 3);

src/main/java/com/jeesite/modules/mes/web/MesProductVoltageController.java

@@ -0,0 +1,118 @@
+package com.jeesite.modules.mes.web;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.mes.entity.MesProductVoltage;
+import com.jeesite.modules.mes.resp.CommonResp;
+import com.jeesite.modules.mes.service.MesProductVoltageService;
+
+/**
+ * 绝缘电压数据表Controller
+ * @author sxl
+ * @version 2026-08-15
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/mes/mesProductVoltage")
+public class MesProductVoltageController extends BaseController {
+
+	@Autowired
+	private MesProductVoltageService mesProductVoltageService;
+	
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesProductVoltage get(String id, boolean isNewRecord) {
+		return mesProductVoltageService.get(id, isNewRecord);
+	}
+	
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("mes:mesProductVoltage:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesProductVoltage mesProductVoltage, Model model) {
+		model.addAttribute("mesProductVoltage", mesProductVoltage);
+		return "modules/mes/mesProductVoltageList";
+	}
+	
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("mes:mesProductVoltage:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesProductVoltage> listData(MesProductVoltage mesProductVoltage, HttpServletRequest request, HttpServletResponse response) {
+		mesProductVoltage.setPage(new Page<>(request, response));
+		Page<MesProductVoltage> page = mesProductVoltageService.findPage(mesProductVoltage);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("mes:mesProductVoltage:view")
+	@RequestMapping(value = "form")
+	public String form(MesProductVoltage mesProductVoltage, Model model) {
+		model.addAttribute("mesProductVoltage", mesProductVoltage);
+		return "modules/mes/mesProductVoltageForm";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("mes:mesProductVoltage:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesProductVoltage mesProductVoltage) {
+		mesProductVoltageService.save(mesProductVoltage);
+		return renderResult(Global.TRUE, text("保存绝缘电压数据表成功！"));
+	}
+	
+	/**
+	 * 删除数据
+	 */
+	@RequiresPermissions("mes:mesProductVoltage:edit")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public String delete(MesProductVoltage mesProductVoltage) {
+		mesProductVoltageService.delete(mesProductVoltage);
+		return renderResult(Global.TRUE, text("删除绝缘电压数据表成功！"));
+	}
+
+	/**
+	 * 客户端上报绝缘电压检测数据（无权限，供工位机调用）
+	 */
+	@PostMapping(value = "add")
+	@ResponseBody
+	public CommonResp<String> add(@RequestBody MesProductVoltage mesProductVoltage) {
+		CommonResp<String> resp = new CommonResp<>();
+		if (mesProductVoltage == null || StringUtils.isEmpty(mesProductVoltage.getSn())) {
+			resp.setResult(Global.FALSE);
+			resp.setMessage("缺少工件码");
+			return resp;
+		}
+		mesProductVoltageService.save(mesProductVoltage);
+		resp.setResult(Global.TRUE);
+		resp.setMessage("保存成功");
+		return resp;
+	}
+	
+}

src/main/resources/config/application.yml

@@ -752,6 +752,26 @@ shiro:
     ${adminPath}/mes/mesProductCncLife/saveLife= anon
     ${adminPath}/mes/mesProductCncParam/batchsave= anon
     ${adminPath}/mes/mesProductCncToolGeo/saveToolGeo= anon
+    ${adminPath}/mes/mesProduct/screen= anon
+    ${adminPath}/mes/mesProduct/screen3= anon
+    ${adminPath}/mes/mesProduct/screen5= anon
+    ${adminPath}/mes/mesProduct/screen6= anon
+    ${adminPath}/mes/mesProduct/hourlyUpDownOkData = anon
+    ${adminPath}/mes/mesProduct/defectTypeData= anon
+    ${adminPath}/mes/mesProductScreen/latestConfig= anon
+    ${adminPath}/mes/mesDeviceAlarm/listData= anon
+    ${adminPath}/mes/mesRepair/listData= anon
+    ${adminPath}/mes/mesScrap/listData= anon
+    ${adminPath}/mes/mesLineProcess/listData= anon
+    ${adminPath}/mes/mesProductRecord/weekQualityData= anon
+    ${adminPath}/mes/mesProductRecord/dayCapacityData= anon
+    ${adminPath}/mes/mesProductRecord/shiftCapacityData= anon
+    ${adminPath}/mes/mesProductRecord/monthlyProductData= anon
+    ${adminPath}/mes/mesProductRecord/listData= anon
+    ${adminPath}/mes/mesPlan/latestPlanNums= anon
+    ${adminPath}/mes/mesDevice/listData= anon
+    ${adminPath}/sys/empUser/listData= anon
+    ${adminPath}/mes/mesProductVoltage/add= anon
     
     
   

src/main/resources/mappings/modules/mes/MesProductVoltageDao.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeesite.modules.mes.dao.MesProductVoltageDao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesProductVoltage">
+		SELECT ${sqlMap.column.toSql()}
+		FROM ${sqlMap.table.toSql()}
+		<where>
+			${sqlMap.where.toSql()}
+		</where>
+		ORDER BY ${sqlMap.order.toSql()}
+	</select> -->
+	
+</mapper>

src/main/resources/views/modules/mes/mesProductVoltageForm.html

@@ -0,0 +1,118 @@
+<% layout('/layouts/default.html', {title: '绝缘电压数据表管理', libs: ['validate']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header with-border">
+			<div class="box-title">
+				<i class="fa icon-note"></i> ${text(mesProductVoltage.isNewRecord ? '新增绝缘电压数据表' : '编辑绝缘电压数据表')}
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+		<#form:form id="inputForm" model="${mesProductVoltage}" action="${ctx}/mes/mesProductVoltage/save" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">${text('基本信息')}</div>
+				<#form:hidden path="id"/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('工件码')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="sn" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('检测电流')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="current" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('爬升电流')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="currentPs" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('电压1')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="oneVoltage" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('电压2')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="twoVoltage" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('电阻')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="resistance" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('检测结果')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="result" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('检测次数')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="time" maxlength="64" class="form-control"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+						<% if (hasPermi('mes:mesProductVoltage:edit')){ %>
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
+						<% } %>
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>
+					</div>
+				</div>
+			</div>
+		</#form:form>
+	</div>
+</div>
+<% } %>
+<script>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.result == Global.TRUE){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>

src/main/resources/views/modules/mes/mesProductVoltageList.html

@@ -0,0 +1,107 @@
+<% layout('/layouts/default.html', {title: '绝缘电压数据表管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-notebook"></i> ${text('绝缘电压数据表管理')}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
+				<% if(hasPermi('mes:mesProductVoltage:edit')){ %>
+					<a href="${ctx}/mes/mesProductVoltage/form" class="btn btn-default btnTool" title="${text('新增绝缘电压数据表')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+				<% } %>
+				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
+			<#form:form id="searchForm" model="${mesProductVoltage}" action="${ctx}/mes/mesProductVoltage/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('工件码')}：</label>
+					<div class="control-inline">
+						<#form:input path="sn" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('检测电流')}：</label>
+					<div class="control-inline">
+						<#form:input path="current" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('爬升电流')}：</label>
+					<div class="control-inline">
+						<#form:input path="currentPs" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('电压1')}：</label>
+					<div class="control-inline">
+						<#form:input path="oneVoltage" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('电压2')}：</label>
+					<div class="control-inline">
+						<#form:input path="twoVoltage" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('电阻')}：</label>
+					<div class="control-inline">
+						<#form:input path="resistance" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('检测结果')}：</label>
+					<div class="control-inline">
+						<#form:input path="result" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('检测次数')}：</label>
+					<div class="control-inline">
+						<#form:input path="time" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesProductVoltage/form?id='+row.id+'" class="btnList" data-title="${text("编辑绝缘电压数据表")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("检测电流")}', name:'current', index:'a.current', width:150, align:"left"},
+		{header:'${text("爬升电流")}', name:'currentPs', index:'a.current_ps', width:150, align:"left"},
+		{header:'${text("电压1")}', name:'oneVoltage', index:'a.one_voltage', width:150, align:"left"},
+		{header:'${text("电压2")}', name:'twoVoltage', index:'a.two_voltage', width:150, align:"left"},
+		{header:'${text("电阻")}', name:'resistance', index:'a.resistance', width:150, align:"left"},
+		{header:'${text("检测结果")}', name:'result', index:'a.result', width:150, align:"left"},
+		{header:'${text("检测次数")}', name:'time', index:'a.time', width:150, align:"left"},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('mes:mesProductVoltage:edit')){ %>
+				actions.push('<a href="${ctx}/mes/mesProductVoltage/form?id='+row.id+'" class="btnList" title="${text("编辑绝缘电压数据表")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/mes/mesProductVoltage/delete?id='+row.id+'" class="btnList" title="${text("删除绝缘电压数据表")}" data-confirm="${text("确认要删除该绝缘电压数据表吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>