增加工件码

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

@@ -14,6 +14,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
  */
 @Table(name="mes_product_qmzc", alias="a", label="总成气密数据表信息", columns={
 		@Column(name="id", attrName="id", label="id", isPK=true),
+		@Column(name="sn", attrName="sn", label="工件码", queryType=QueryType.LIKE),
 		@Column(name="ylb_cqsj", attrName="ylbCqsj", label="液冷板充气时间"),
 		@Column(name="ylb_cssj", attrName="ylbCssj", label="液冷板测试时间"),
 		@Column(name="ylb_cqyl", attrName="ylbCqyl", label="液冷板充气压力"),
@@ -35,6 +36,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 public class MesProductQmzc extends DataEntity<MesProductQmzc> {
 	
 	private static final long serialVersionUID = 1L;
+	private String sn;		// 工件码
 	private String ylbCqsj;		// 液冷板充气时间
 	private String ylbCssj;		// 液冷板测试时间
 	private String ylbCqyl;		// 液冷板充气压力
@@ -57,6 +59,15 @@ public class MesProductQmzc extends DataEntity<MesProductQmzc> {
 	public MesProductQmzc(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=255, message="液冷板充气时间长度不能超过 255 个字符")
 	public String getYlbCqsj() {

src/main/java/com/jeesite/modules/scheduling/FrameworkQmScheduling.java

@@ -231,6 +231,7 @@ public class FrameworkQmScheduling {
 			float leakAmount, float holdTime, String ylbStationResult, String stationResult) {
 		try {
 			MesProductQmzc entity = new MesProductQmzc();
+			entity.setSn(qmSn);
 			entity.setYlbCqsj(fmt(ylbInflationTime));
 			entity.setYlbCssj(fmt(ylbTestTime));
 			entity.setYlbCqyl(fmt(ylbInflationPressure));

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

@@ -17,6 +17,15 @@
 					<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="ylbCqsj" maxlength="255" class="form-control"/>

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

@@ -17,6 +17,12 @@
 			<#form:form id="searchForm" model="${mesProductQmzc}" action="${ctx}/mes/mesProductQmzc/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="ylbCqsj" maxlength="255" class="form-control width-120"/>
@@ -116,9 +122,10 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'${text("液冷板充气时间")}', name:'ylbCqsj', index:'a.ylb_cqsj', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:180, align:"left", frozen:true, formatter: function(val, obj, row, act){
 			return '<a href="${ctx}/mes/mesProductQmzc/form?id='+row.id+'" class="btnList" data-title="${text("编辑总成气密数据表")}">'+(val||row.id)+'</a>';
 		}},
+		{header:'${text("液冷板充气时间")}', name:'ylbCqsj', index:'a.ylb_cqsj', width:150, align:"left"},
 		{header:'${text("液冷板测试时间")}', name:'ylbCssj', index:'a.ylb_cssj', width:150, align:"left"},
 		{header:'${text("液冷板充气压力")}', name:'ylbCqyl', index:'a.ylb_cqyl', width:150, align:"left"},
 		{header:'${text("液冷板稳定压力")}', name:'ylbWdyl', index:'a.ylb_wdyl', width:150, align:"left"},