Merge branch 'master' of http://121.36.46.135:3000/mes-ljz/mescloud

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

@@ -37,8 +37,8 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 		@Column(name="oprno", attrName="oprno", label="工位号", queryType=QueryType.LIKE),
 		@Column(name="line_sn", attrName="lineSn", label="产线编号"),
 		@Column(name="cq_duration", attrName="cqDuration", label="充气时间"),
-		@Column(name="by_duration", attrName="byDuration", label="保压时间"),
-		@Column(name="cs_duration", attrName="csDuration", label="测试时间"),
+		@Column(name="by_duration", attrName="byDuration", label="稳压时长"),
+		@Column(name="cs_duration", attrName="csDuration", label="测试时长"),
 		@Column(name="program_no", attrName="programNo", label="程序号"),
 		@Column(name="device_type", attrName="deviceType", label="检测设备"),
 		@Column(name="create_date", attrName="createDate", label="create_date", isUpdate=false, isQuery=false, isUpdateForce=true),
@@ -84,8 +84,10 @@ public class MesProductQm extends DataEntity<MesProductQm> {
 		@ExcelField(title="测试压单位", attrName="testPressureUnit", align=Align.CENTER, sort=70),
 		@ExcelField(title="泄露值", attrName="leakVal", align=Align.CENTER, sort=80),
 		@ExcelField(title="泄露值单位", attrName="leakValUnit", align=Align.CENTER, sort=90),
-		@ExcelField(title="泄露率", attrName="leakRate", align=Align.CENTER, sort=91),
-		@ExcelField(title="泄露率单位", attrName="laekRateUnit", align=Align.CENTER, sort=92),
+		@ExcelField(title="稳压时长", attrName="byDuration", align=Align.CENTER, sort=93),
+		@ExcelField(title="测试时长", attrName="csDuration", align=Align.CENTER, sort=94),
+		@ExcelField(title="泄露率", attrName="leakRate", align=Align.CENTER, sort=95),
+		@ExcelField(title="泄露率单位", attrName="laekRateUnit", align=Align.CENTER, sort=96),
 		@ExcelField(title="测试结果", attrName="testResult", align=Align.CENTER, sort=100),
 		@ExcelField(title="测试节拍", attrName="testPace", align=Align.CENTER, sort=110),
 		@ExcelField(title="产品类型", attrName="productCate", align=Align.CENTER, sort=120),

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

@@ -3153,9 +3153,9 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 		String oprno = mesProductQmReq.getOprno();
 		String lineSn = mesProductQmReq.getLineSn();
 		String userCode = mesProductQmReq.getWorkNum(); // 工号
-//		String by = mesProductQmReq.getBy(); // 保压时间
-//		String cq = mesProductQmReq.getCq(); // 充气时间
-//		String cs = mesProductQmReq.getCs(); // 测试时间
+		String by = mesProductQmReq.getBy(); // 稳压时长
+		String cq = mesProductQmReq.getCq(); // 充气时长
+		String cs = mesProductQmReq.getCs(); // 测试时长
 		String cxm = mesProductQmReq.getCxm(); // 程序号
 		String result = mesProductQmReq.getResult();
 		String testPressure = CommonUitl.getBase64Decode(mesProductQmReq.getTestPressure()); // 测试压
@@ -3190,6 +3190,9 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 			mesProductQm.setProgramNo(cxm);
 			mesProductQm.setTitle(title);
 			mesProductQm.setRemark(remark);
+			mesProductQm.setCqDuration(cq);
+			mesProductQm.setByDuration(by);
+			mesProductQm.setCsDuration(cs);
 			mesProductQmService.add(mesProductQm);
 
 			// 检查是否是样件

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

@@ -90,6 +90,24 @@
 					<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="byDuration" maxlength="200" 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="csDuration" maxlength="200" 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="testResult" maxlength="200" class="form-control"/>

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

@@ -78,6 +78,8 @@ $('#dataGrid').dataGrid({
 		{header:'${text("测试压单位")}', name:'testPressureUnit', index:'a.test_pressure_unit', width:150, align:"center"},
 		{header:'${text("泄露值")}', name:'leakVal', index:'a.leak_val', width:150, align:"center"},
 		{header:'${text("泄露值单位")}', name:'leakValUnit', index:'a.leak_val_unit', width:150, align:"center"},
+		{header:'${text("稳压时长")}', name:'byDuration', index:'a.by_duration', width:120, align:"center"},
+		{header:'${text("测试时长")}', name:'csDuration', index:'a.cs_duration', width:120, align:"center"},
 		// {header:'${text("泄露率")}', name:'leakRate', index:'a.leak_rate', width:150, align:"center"},
 		// {header:'${text("泄露率单位")}', name:'leakRateUnit', index:'a.leak_rate_unit', width:150, align:"center"},
 		{header:'${text("测试结果")}', name:'testResult', index:'a.test_result', width:150, align:"center"},