新增气密泄露点位记录

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

@@ -46,6 +46,7 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 		@Column(name="fid", attrName="fid", label="来源主键id", isQuery=false),
 		@Column(name="title", attrName="title", label="名称"),
 		@Column(name="remark", attrName="remark", label="备注"),
+		@Column(name="ng_leak_points", attrName="ngLeakPoints", label="漏点NG点位"),
 	}, orderBy="a.update_date DESC"
 )
 public class MesProductQm extends DataEntity<MesProductQm> {
@@ -74,6 +75,7 @@ public class MesProductQm extends DataEntity<MesProductQm> {
 	private String programNo;
 	private String title;
 	private String remark;
+	private String ngLeakPoints;		// 漏点NG点位及其它原因
 
 	@ExcelFields({
 		@ExcelField(title="序号", attrName="id", align=Align.CENTER, sort=10),
@@ -87,6 +89,7 @@ public class MesProductQm extends DataEntity<MesProductQm> {
 		@ExcelField(title="泄露率", attrName="leakRate", align=Align.CENTER, sort=91),
 		@ExcelField(title="泄露率单位", attrName="laekRateUnit", align=Align.CENTER, sort=92),
 		@ExcelField(title="测试结果", attrName="testResult", align=Align.CENTER, sort=100),
+		@ExcelField(title="漏点NG点位", attrName="ngLeakPoints", align=Align.CENTER, sort=105),
 		@ExcelField(title="测试节拍", attrName="testPace", align=Align.CENTER, sort=110),
 		@ExcelField(title="产品类型", attrName="productCate", align=Align.CENTER, sort=120),
 		@ExcelField(title="工位号", attrName="oprno", align=Align.CENTER, sort=130),
@@ -318,4 +321,13 @@ public class MesProductQm extends DataEntity<MesProductQm> {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	@Size(min=0, max=1000, message="漏点NG点位长度不能超过 1000 个字符")
+	public String getNgLeakPoints() {
+		return ngLeakPoints;
+	}
+
+	public void setNgLeakPoints(String ngLeakPoints) {
+		this.ngLeakPoints = ngLeakPoints;
+	}
 }

src/main/java/com/jeesite/modules/mes/req/MesProductQmReq.java

@@ -21,6 +21,7 @@ public class MesProductQmReq {
     private String title;
     private String remark;
     private String deviceType;
+    private String ngLeakPoints;
 
     public String getTitle() {
         return title;
@@ -182,6 +183,14 @@ public class MesProductQmReq {
         this.deviceType = deviceType;
     }
 
+    public String getNgLeakPoints() {
+        return ngLeakPoints;
+    }
+
+    public void setNgLeakPoints(String ngLeakPoints) {
+        this.ngLeakPoints = ngLeakPoints;
+    }
+
     @Override
     public String toString() {
         return "MesProductQmReq{" +
@@ -202,6 +211,7 @@ public class MesProductQmReq {
                 ", leakRateUnit='" + leakRateUnit + '\'' +
                 ", testTime='" + testTime + '\'' +
                 ", type='" + type + '\'' +
+                ", ngLeakPoints='" + ngLeakPoints + '\'' +
                 '}';
     }
 }

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

@@ -2712,6 +2712,7 @@ public class MesProductRecordController extends BaseController {
 		String craft = request.getParameter("craft");
 		String remark = mesProductQmReq.getRemark();
 		String deviceType = mesProductQmReq.getDeviceType();
+		String ngLeakPoints = mesProductQmReq.getNgLeakPoints();
 
 		if(StringUtils.isEmpty(sn) || StringUtils.isEmpty(oprno) || StringUtils.isEmpty(result) || StringUtils.isEmpty(lineSn)){
 			return renderResult(Global.FALSE, text("参数错误1！"));
@@ -2742,6 +2743,7 @@ public class MesProductRecordController extends BaseController {
 			mesProductQm.setProgramNo(cxm);
 			mesProductQm.setTitle(title);
 			mesProductQm.setRemark(remark);
+			mesProductQm.setNgLeakPoints(ngLeakPoints);
 			mesProductQmService.add(mesProductQm);
 
 			// 样件：只记点检结果，不走正式件过站

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

@@ -99,6 +99,15 @@
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('漏点NG点位')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="ngLeakPoints" maxlength="1000" 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="testPace" maxlength="200" class="form-control"/>

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

@@ -81,6 +81,7 @@ $('#dataGrid').dataGrid({
 		// {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"},
+		{header:'${text("漏点NG点位")}', name:'ngLeakPoints', index:'a.ng_leak_points', width:250, align:"left"},
 		// {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 		// 	var actions = [];
 		// 	//<% if(hasPermi('mes:mesProductQm:edit')){ %>