新增绝缘耐压测试模块

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

@@ -5,9 +5,9 @@ import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.mes.entity.MesProductInsulation2;
 
 /**
- * 冷板绝缘检测DAO接口
- * @author LiuQing
- * @version 2025-03-07
+ * 绝缘耐压检测DAO接口
+ * @author hwb
+ * @version 2026-06-25
  */
 @MyBatisDao
 public interface MesProductInsulation2Dao extends CrudDao<MesProductInsulation2> {

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

@@ -1,62 +1,44 @@
 package com.jeesite.modules.mes.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+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;
-import com.jeesite.common.utils.excel.annotation.ExcelField;
-import com.jeesite.common.utils.excel.annotation.ExcelFields;
 
-import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
- * 冷板绝缘检测Entity
- * @author LiuQing
- * @version 2025-03-07
+ * 绝缘耐压检测Entity
+ * @author hwb
+ * @version 2026-06-25
  */
-@Table(name="mes_product_insulation2", alias="a", label="冷板绝缘检测信息", columns={
+@Table(name="mes_product_insulation2", alias="a", label="绝缘耐压检测信息", columns={
 		@Column(name="id", attrName="id", label="id", isPK=true),
-		@Column(name="sn", attrName="sn", label="工件码"),
-		@Column(name="oprno", attrName="oprno", label="工位号"),
-		@Column(name="test_type", attrName="testType", label="测试类型"),
-		@Column(name="test_result", attrName="testResult", label="测试结果"),
-		@Column(name="test_state", attrName="testState", label="测试状态"),
-		@Column(name="voltage", attrName="voltage", label="测试电压"),
-		@Column(name="res_or_cur", attrName="resOrCur", label="测试电阻/电流"),
-		@Column(name="test_time", attrName="testTime", label="测试时间"),
-		@Column(name="record_time", attrName="recordTime", label="记录时间", isUpdateForce=true),
+		@Column(name="sn", attrName="sn", label="工件码", queryType=QueryType.LIKE),
+		@Column(name="step", attrName="step", label="步骤"),
+		@Column(name="voltage", attrName="voltage", label="电压"),
+		@Column(name="voltage_unit", attrName="voltageUnit", label="电压单位"),
+		@Column(name="data", attrName="data", label="测试数据"),
+		@Column(name="data_unit", attrName="dataUnit", label="测试数据单位"),
+		@Column(name="result", attrName="result", label="测试结果"),
 		@Column(name="create_by", attrName="createBy", label="create_by", isUpdate=false, isQuery=false),
 		@Column(name="create_date", attrName="createDate", label="create_date", isUpdate=false, isQuery=false, isUpdateForce=true),
 		@Column(name="update_by", attrName="updateBy", label="update_by", isQuery=false),
-		@Column(name="update_date", attrName="updateDate", label="update_date", isQuery=false, isUpdateForce=true),
+		@Column(name="update_date", attrName="updateDate", label="update_date", isUpdateForce=true),
 	}, orderBy="a.update_date DESC"
 )
 public class MesProductInsulation2 extends DataEntity<MesProductInsulation2> {
 	
 	private static final long serialVersionUID = 1L;
 	private String sn;		// 工件码
-	private String oprno;		// 工位号
-	private String testType;		// 测试类型
-	private String testResult;		// 测试结果
-	private String testState;		// 测试状态
-	private String voltage;		// 测试电压
-	private String resOrCur;		// 测试电阻/电流
-	private String testTime;		// 测试时间
-	private Date recordTime;		// 记录时间
-
-	@ExcelFields({
-			@ExcelField(title="工件码", attrName="sn", align= ExcelField.Align.CENTER, sort=10),
-			@ExcelField(title="工位号", attrName="oprno", align= ExcelField.Align.CENTER, sort=20),
-			@ExcelField(title="测试类型", attrName="testType", align= ExcelField.Align.CENTER, sort=30),
-			@ExcelField(title="测试结果", attrName="testResult", align= ExcelField.Align.CENTER, sort=40),
-			@ExcelField(title="测试状态", attrName="testState", align= ExcelField.Align.CENTER, sort=50),
-			@ExcelField(title="测试电压", attrName="voltage", align= ExcelField.Align.CENTER, sort=60),
-			@ExcelField(title="测试电阻/测试电流", attrName="resOrCur", align= ExcelField.Align.CENTER, sort=70),
-			@ExcelField(title="测试时间/斜坡时间", attrName="testTime", align= ExcelField.Align.CENTER, sort=80),
-			@ExcelField(title="记录时间", attrName="recordTime", align= ExcelField.Align.CENTER, sort=90),
-	})
+	private String step;		// 步骤
+	private String voltage;		// 电压
+	private String voltageUnit;		// 电压单位
+	private String data;		// 测试数据
+	private String dataUnit;		// 测试数据单位
+	private String result;		// 测试结果
 
 	public MesProductInsulation2() {
 		this(null);
@@ -75,43 +57,16 @@ public class MesProductInsulation2 extends DataEntity<MesProductInsulation2> {
 		this.sn = sn;
 	}
 	
-	@Size(min=0, max=25, message="工位号长度不能超过 25 个字符")
-	public String getOprno() {
-		return oprno;
-	}
-
-	public void setOprno(String oprno) {
-		this.oprno = oprno;
-	}
-	
-	@Size(min=0, max=255, message="测试类型长度不能超过 255 个字符")
-	public String getTestType() {
-		return testType;
-	}
-
-	public void setTestType(String testType) {
-		this.testType = testType;
-	}
-	
-	@Size(min=0, max=64, message="测试结果长度不能超过 64 个字符")
-	public String getTestResult() {
-		return testResult;
-	}
-
-	public void setTestResult(String testResult) {
-		this.testResult = testResult;
-	}
-	
-	@Size(min=0, max=64, message="测试状态长度不能超过 64 个字符")
-	public String getTestState() {
-		return testState;
+	@Size(min=0, max=10, message="步骤长度不能超过 10 个字符")
+	public String getStep() {
+		return step;
 	}
 
-	public void setTestState(String testState) {
-		this.testState = testState;
+	public void setStep(String step) {
+		this.step = step;
 	}
 	
-	@Size(min=0, max=255, message="测试电压长度不能超过 255 个字符")
+	@Size(min=0, max=20, message="电压长度不能超过 20 个字符")
 	public String getVoltage() {
 		return voltage;
 	}
@@ -120,47 +75,56 @@ public class MesProductInsulation2 extends DataEntity<MesProductInsulation2> {
 		this.voltage = voltage;
 	}
 	
-	@Size(min=0, max=255, message="测试电阻/电流长度不能超过 255 个字符")
-	public String getResOrCur() {
-		return resOrCur;
+	@Size(min=0, max=10, message="电压单位长度不能超过 10 个字符")
+	public String getVoltageUnit() {
+		return voltageUnit;
+	}
+
+	public void setVoltageUnit(String voltageUnit) {
+		this.voltageUnit = voltageUnit;
+	}
+	
+	@Size(min=0, max=20, message="测试数据长度不能超过 20 个字符")
+	public String getData() {
+		return data;
 	}
 
-	public void setResOrCur(String resOrCur) {
-		this.resOrCur = resOrCur;
+	public void setData(String data) {
+		this.data = data;
 	}
 	
-	@Size(min=0, max=128, message="测试时间长度不能超过 128 个字符")
-	public String getTestTime() {
-		return testTime;
+	@Size(min=0, max=10, message="测试数据单位长度不能超过 10 个字符")
+	public String getDataUnit() {
+		return dataUnit;
 	}
 
-	public void setTestTime(String testTime) {
-		this.testTime = testTime;
+	public void setDataUnit(String dataUnit) {
+		this.dataUnit = dataUnit;
 	}
 	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getRecordTime() {
-		return recordTime;
+	@Size(min=0, max=10, message="测试结果长度不能超过 10 个字符")
+	public String getResult() {
+		return result;
 	}
 
-	public void setRecordTime(Date recordTime) {
-		this.recordTime = recordTime;
+	public void setResult(String result) {
+		this.result = result;
 	}
 	
-	public Date getRecordTime_gte() {
-		return sqlMap.getWhere().getValue("record_time", QueryType.GTE);
+	public Date getUpdateDate_gte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.GTE);
 	}
 
-	public void setRecordTime_gte(Date recordTime) {
-		sqlMap.getWhere().and("record_time", QueryType.GTE, recordTime);
+	public void setUpdateDate_gte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.GTE, updateDate);
 	}
 	
-	public Date getRecordTime_lte() {
-		return sqlMap.getWhere().getValue("record_time", QueryType.LTE);
+	public Date getUpdateDate_lte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.LTE);
 	}
 
-	public void setRecordTime_lte(Date recordTime) {
-		sqlMap.getWhere().and("record_time", QueryType.LTE, recordTime);
+	public void setUpdateDate_lte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.LTE, updateDate);
 	}
 	
 }

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

@@ -1,18 +1,23 @@
 package com.jeesite.modules.mes.service;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.service.CrudService;
+import com.jeesite.common.service.ServiceException;
 import com.jeesite.modules.mes.dao.MesProductInsulation2Dao;
 import com.jeesite.modules.mes.entity.MesProductInsulation2;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
- * 冷板绝缘检测Service
- * @author LiuQing
- * @version 2025-03-07
+ * 绝缘耐压检测Service
+ * @author hwb
+ * @version 2026-06-25
  */
 @Service
 public class MesProductInsulation2Service extends CrudService<MesProductInsulation2Dao, MesProductInsulation2> {
@@ -77,5 +82,60 @@ public class MesProductInsulation2Service extends CrudService<MesProductInsulati
 	public void delete(MesProductInsulation2 mesProductInsulation2) {
 		super.delete(mesProductInsulation2);
 	}
+
+	/**
+	 * 工位客户端批量上传绝缘耐压测试数据（每一步一条记录）。
+	 */
+	@Transactional
+	public void batchUpload(String sn, String userCode, JSONArray stepsArr) {
+		for (int i = 0; i < stepsArr.size(); i++) {
+			JSONObject obj = stepsArr.getJSONObject(i);
+			String step = obj.getString("step");
+			String voltage = obj.getString("voltage");
+			String voltageUnit = obj.getString("voltageUnit");
+			String data = obj.getString("data");
+			String dataUnit = obj.getString("dataUnit");
+			String result = normalizeResult(obj.getString("result"));
+
+			if (StringUtils.isEmpty(step) || StringUtils.isEmpty(voltage)
+					|| StringUtils.isEmpty(data) || StringUtils.isEmpty(result)) {
+				throw new ServiceException(text("第" + (i + 1) + "条步骤数据不完整！"));
+			}
+			if (StringUtils.isEmpty(voltageUnit)) {
+				voltageUnit = "kV";
+			}
+			if (StringUtils.isEmpty(dataUnit)) {
+				dataUnit = "1".equals(step) ? "GΩ" : "μA";
+			}
+
+			MesProductInsulation2 entity = new MesProductInsulation2();
+			entity.setSn(sn);
+			entity.setStep(step);
+			entity.setVoltage(voltage);
+			entity.setVoltageUnit(voltageUnit);
+			entity.setData(data);
+			entity.setDataUnit(dataUnit);
+			entity.setResult(result);
+			if (StringUtils.isNotEmpty(userCode)) {
+				entity.setCreateBy(userCode);
+				entity.setUpdateBy(userCode);
+			}
+			super.save(entity);
+		}
+	}
+
+	private String normalizeResult(String result) {
+		if (StringUtils.isEmpty(result)) {
+			return result;
+		}
+		String value = result.trim().toUpperCase();
+		if ("OK".equals(value) || "PASS".equals(value) || "合格".equals(result.trim())) {
+			return "OK";
+		}
+		if ("NG".equals(value) || "FAIL".equals(value) || "不合格".equals(result.trim())) {
+			return "NG";
+		}
+		return result.trim();
+	}
 	
 }

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

@@ -1,29 +1,35 @@
 package com.jeesite.modules.mes.web;
 
-import com.jeesite.common.config.Global;
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.lang.DateUtils;
-import com.jeesite.common.utils.excel.ExcelExport;
-import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.mes.entity.MesProductInsulation2;
-import com.jeesite.modules.mes.resp.CommonResp;
-import com.jeesite.modules.mes.service.MesProductInsulation2Service;
+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.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.service.ServiceException;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.mes.entity.MesProductInsulation2;
+import com.jeesite.modules.mes.service.MesLogService;
+import com.jeesite.modules.mes.service.MesProductInsulation2Service;
 
 /**
- * 冷板绝缘检测Controller
- * @author LiuQing
- * @version 2025-03-07
+ * 绝缘耐压检测Controller
+ * @author hwb
+ * @version 2026-06-25
  */
 @Controller
 @RequestMapping(value = "${adminPath}/mes/mesProductInsulation2")
@@ -31,6 +37,9 @@ public class MesProductInsulation2Controller extends BaseController {
 
 	@Autowired
 	private MesProductInsulation2Service mesProductInsulation2Service;
+
+	@Autowired
+	private MesLogService mesLogService;
 	
 	/**
 	 * 获取数据
@@ -80,7 +89,7 @@ public class MesProductInsulation2Controller extends BaseController {
 	@ResponseBody
 	public String save(@Validated MesProductInsulation2 mesProductInsulation2) {
 		mesProductInsulation2Service.save(mesProductInsulation2);
-		return renderResult(Global.TRUE, text("保存冷板绝缘检测成功！"));
+		return renderResult(Global.TRUE, text("保存绝缘耐压检测成功！"));
 	}
 	
 	/**
@@ -91,33 +100,61 @@ public class MesProductInsulation2Controller extends BaseController {
 	@ResponseBody
 	public String delete(MesProductInsulation2 mesProductInsulation2) {
 		mesProductInsulation2Service.delete(mesProductInsulation2);
-		return renderResult(Global.TRUE, text("删除冷板绝缘检测成功！"));
+		return renderResult(Global.TRUE, text("删除绝缘耐压检测成功！"));
 	}
 
-	@PostMapping("add")
+	/**
+	 * 工位客户端上传绝缘耐压测试数据（UT5310 等）。
+	 * <p>
+	 * POST ${adminPath}/mes/mesProductInsulation2/batchUpload
+	 * <p>
+	 * 参数：
+	 * <ul>
+	 *   <li>sn - 工件码（必填）</li>
+	 *   <li>steps - JSON 数组字符串（必填），每步一条，字段见下</li>
+	 *   <li>ucode - 操作员（可选）</li>
+	 * </ul>
+	 * steps 元素示例：
+	 * <pre>
+	 * [
+	 *   {"step":"1","voltage":"1.0000","voltageUnit":"kV","data":"1.6500","dataUnit":"GΩ","result":"OK"},
+	 *   {"step":"2","voltage":"0.5000","voltageUnit":"kV","data":"1.70","dataUnit":"μA","result":"OK"}
+	 * ]
+	 * </pre>
+	 */
+	@PostMapping(value = "batchUpload")
 	@ResponseBody
-	public CommonResp<String> add(@RequestBody MesProductInsulation2 mesProductInsulation) {
+	@Transactional
+	public String batchUpload(HttpServletRequest request) {
+		mesLogService.apisave(request);
+
+		String sn = request.getParameter("sn");
+		String steps = request.getParameter("steps");
+		String userCode = request.getParameter("ucode");
 
-		CommonResp<String> resp = new CommonResp<>();
-		// 数据校验
-		if(!StringUtils.hasText(mesProductInsulation.getOprno()) || !StringUtils.hasText(mesProductInsulation.getSn())){
-			resp.setResult(Global.FALSE);
-			resp.setMessage("缺少必要参数");
-			return resp;
+		if (StringUtils.isEmpty(sn) || StringUtils.isEmpty(steps)) {
+			return renderResult(Global.FALSE, text("参数错误！"));
 		}
 
-		mesProductInsulation2Service.save(mesProductInsulation);
-		resp.setResult(Global.TRUE);
-		return resp;
-	}
+		JSONArray stepsArr;
+		try {
+			stepsArr = JSON.parseArray(steps);
+		} catch (Exception e) {
+			return renderResult(Global.FALSE, text("steps 格式错误！"));
+		}
+		if (stepsArr == null || stepsArr.isEmpty()) {
+			return renderResult(Global.FALSE, text("steps 不能为空！"));
+		}
 
-	@RequiresPermissions("mes:mesProductInsulation2:view")
-	@RequestMapping(value = "exportData")
-	public void exportData(MesProductInsulation2 mesProductInsulation, HttpServletResponse response) {
-		List<MesProductInsulation2> list = mesProductInsulation2Service.findList(mesProductInsulation);
-		String fileName = "绝缘耐压测试记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
-		try(ExcelExport ee = new ExcelExport("绝缘耐压测试记录", MesProductInsulation2.class)){
-			ee.setDataList(list).write(response, fileName);
+		try {
+			mesProductInsulation2Service.batchUpload(sn.trim(), userCode, stepsArr);
+			return renderResult(Global.TRUE, text("操作成功！"));
+		} catch (ServiceException e) {
+			return renderResult(Global.FALSE, text(e.getMessage()));
+		} catch (Exception e) {
+			logger.error("insulation2 batchUpload failed", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return renderResult(Global.FALSE, text("操作失败！"));
 		}
 	}
 	

src/main/resources/config/application.yml

@@ -658,6 +658,7 @@ shiro:
     ${adminPath}/mes/mesProductYgsl/batchsave = anon
     ${adminPath}/mes/mesProductHb/upload = anon
     ${adminPath}/mes/mesProductRivet/batchUpload = anon
+    ${adminPath}/mes/mesProductInsulation2/batchUpload = anon
     ${adminPath}/mes/mesProductCmt/batchsave = anon
     ${adminPath}/mes/mesDeviceState/add = anon
     ${adminPath}/mes/mesDeviceTime/list2 = anon
@@ -689,6 +690,7 @@ shiro:
     ${adminPath}/mes/mesProductRecord/pccreate = anon
     ${adminPath}/mes/mesProductRecord/changeLine = anon
     ${adminPath}/mes/mesProductRivet/batchUpload = anon
+    ${adminPath}/mes/mesProductInsulation2/batchUpload = anon
     ${adminPath}/** = user
 
 

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

@@ -1,9 +1,9 @@
-<% layout('/layouts/default.html', {title: '冷板绝缘检测管理', libs: ['validate']}){ %>
+<% 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(mesProductInsulation2.isNewRecord ? '新增冷板绝缘检测' : '编辑冷板绝缘检测')}
+				<i class="fa icon-note"></i> ${text(mesProductInsulation2.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>
@@ -14,85 +14,78 @@
 				<div class="form-unit">${text('基本信息')}</div>
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-xs-12">
 						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
+							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> ${text('工件码')}：<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-8">
+							<div class="col-sm-4">
 								<#form:input path="sn" maxlength="50" 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="oprno" maxlength="25" 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="testType" maxlength="255" class="form-control"/>
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
 						<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="testResult" maxlength="64" class="form-control"/>
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('步骤')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="step" maxlength="10" class="form-control"/>
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
 						<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="testState" maxlength="64" class="form-control"/>
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('电压')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="voltage" maxlength="20" class="form-control"/>
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
 						<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="voltage" maxlength="255" class="form-control"/>
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('电压单位')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="voltageUnit" maxlength="10" class="form-control"/>
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
 						<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="resOrCur" maxlength="255" class="form-control"/>
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('测试数据')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="data" maxlength="20" class="form-control"/>
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
 						<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="testTime" maxlength="128" class="form-control"/>
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('测试数据单位')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="dataUnit" maxlength="10" class="form-control"/>
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
 						<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="recordTime" readonly="true" maxlength="20" class="form-control laydate"
-									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('测试结果')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-4">
+								<#form:input path="result" maxlength="10" class="form-control"/>
 							</div>
 						</div>
 					</div>

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

@@ -1,15 +1,14 @@
-<% layout('/layouts/default.html', {title: '冷板绝缘检测管理', libs: ['dataGrid']}){ %>
+<% 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('冷板绝缘检测管理')}
+				<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>
-				<a href="#" class="btn btn-default" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a>
 				<% if(hasPermi('mes:mesProductInsulation2:edit')){ %>
-<!--					<a href="${ctx}/mes/mesProductInsulation2/form" class="btn btn-default btnTool" title="${text('新增冷板绝缘检测')}"><i class="fa fa-plus"></i> ${text('新增')}</a>-->
+					<a href="${ctx}/mes/mesProductInsulation2/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>
@@ -24,55 +23,37 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('工位号')}：</label>
+					<label class="control-label">${text('步骤')}：</label>
 					<div class="control-inline">
-						<#form:input path="oprno" maxlength="25" class="form-control width-120"/>
+						<#form:input path="step" maxlength="10" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('测试类型')}：</label>
+					<label class="control-label">${text('电压')}：</label>
 					<div class="control-inline">
-						<#form:input path="testType" maxlength="255" class="form-control width-120"/>
+						<#form:input path="voltage" maxlength="20" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('测试结果')}：</label>
-					<div class="control-inline">
-						<#form:input path="testResult" maxlength="64" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('测试状态')}：</label>
+					<label class="control-label">${text('测试数据')}：</label>
 					<div class="control-inline">
-						<#form:input path="testState" maxlength="64" class="form-control width-120"/>
+						<#form:input path="data" maxlength="20" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('测试电压')}：</label>
-					<div class="control-inline">
-						<#form:input path="voltage" maxlength="255" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('测试电阻/测试电流')}：</label>
-					<div class="control-inline">
-						<#form:input path="resOrCur" maxlength="255" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('测试时间/斜坡时间')}：</label>
+					<label class="control-label">${text('测试结果')}：</label>
 					<div class="control-inline">
-						<#form:input path="testTime" maxlength="128" class="form-control width-120"/>
+						<#form:input path="result" maxlength="10" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('记录时间')}：</label>
+					<label class="control-label">${text('update_date')}：</label>
 					<div class="control-inline">
-						<#form:input path="recordTime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="recordTime_lte.click()"/>
+						<#form:input path="updateDate_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime2"
+							dataFormat="datetime2" data-type="datetime" data-format="yyyy-MM-dd HH:mm:ss" data-done="updateDate_lte.click()"/>
 						&nbsp;-&nbsp;
-						<#form:input path="recordTime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+						<#form:input path="updateDate_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime2"
+							dataFormat="datetime2" data-type="datetime" data-format="yyyy-MM-dd HH:mm:ss"/>
 					</div>
 				</div>
 				<div class="form-group">
@@ -91,37 +72,28 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:280, align:"center", frozen:true},
-		{header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:100, align:"center"},
-		{header:'${text("测试类型")}', name:'testType', index:'a.test_type', width:100, align:"center"},
-		{header:'${text("测试结果")}', name:'testResult', index:'a.test_result', width:100, align:"center"},
-		{header:'${text("测试状态")}', name:'testState', index:'a.test_state', width:100, align:"center"},
-		{header:'${text("测试电压")}', name:'voltage', index:'a.voltage', width:150, align:"center"},
-		{header:'${text("测试电阻/测试电流")}', name:'resOrCur', index:'a.res_or_cur', width:150, align:"center"},
-		{header:'${text("测试时间/斜坡时间")}', name:'testTime', index:'a.test_time', width:150, align:"center"},
-		{header:'${text("记录时间")}', name:'recordTime', index:'a.record_time', width:150, align:"center"},
-		// {header:'${text("操作")}', name:'actions', width:60, formatter: function(val, obj, row, act){
-		// 	var actions = [];
-		// 	//<% if(hasPermi('mes:mesProductInsulation2:edit')){ %>
-		// 		actions.push('<a href="${ctx}/mes/mesProductInsulation2/form?id='+row.id+'" class="btnList" title="${text("编辑冷板绝缘检测")}"><i class="fa fa-pencil"></i></a>&nbsp;');
-		// 		actions.push('<a href="${ctx}/mes/mesProductInsulation2/delete?id='+row.id+'" class="btnList" title="${text("删除冷板绝缘检测")}" data-confirm="${text("确认要删除该冷板绝缘检测吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-		// 	//<% } %>
-		// 	return actions.join('');
-		// }}
+		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesProductInsulation2/form?id='+row.id+'" class="btnList" data-title="${text("编辑绝缘耐压检测")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("步骤")}', name:'step', index:'a.step', width:150, align:"left"},
+		{header:'${text("电压")}', name:'voltage', index:'a.voltage', width:150, align:"left"},
+		{header:'${text("电压单位")}', name:'voltageUnit', index:'a.voltage_unit', width:150, align:"left"},
+		{header:'${text("测试数据")}', name:'data', index:'a.data', width:150, align:"left"},
+		{header:'${text("测试数据单位")}', name:'dataUnit', index:'a.data_unit', width:150, align:"left"},
+		{header:'${text("测试结果")}', name:'result', index:'a.result', width:150, align:"left"},
+		{header:'${text("update_date")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('mes:mesProductInsulation2:edit')){ %>
+				actions.push('<a href="${ctx}/mes/mesProductInsulation2/form?id='+row.id+'" class="btnList" title="${text("编辑绝缘耐压检测")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/mes/mesProductInsulation2/delete?id='+row.id+'" class="btnList" title="${text("删除绝缘耐压检测")}" data-confirm="${text("确认要删除该绝缘耐压检测吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
 	],
-	frozenCols: true,
 	// 加载成功后执行事件
 	ajaxSuccess: function(data){
 		
 	}
 });
-</script>
-
-<script>
-	$('#btnExport').click(function(){
-		js.ajaxSubmitForm($('#searchForm'), {
-			url:'${ctx}/mes/mesProductInsulation2/exportData',
-			downloadFile:true
-		});
-	});
 </script>