"气密泄露点位"菜单，图表展示

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

@@ -58,6 +58,7 @@ public class MesProductQm extends DataEntity<MesProductQm> {
 	private String testPressure;		// 测试压
 	private String testPressureUnit;		// 测试压单位
 	private String leakVal;		// 泄露值
+	private String leakagePoint;		// 泄露点位（来自气密泄露记录，非数据库字段）
 	private String leakValUnit;		// 泄露值单位
 	private String leakRate;//泄漏率
 	private String leakRateUnit;//泄漏率单位
@@ -162,6 +163,8 @@ public class MesProductQm extends DataEntity<MesProductQm> {
 	public void setLeakVal(String leakVal) {
 		this.leakVal = leakVal;
 	}
+	public String getLeakagePoint() { return leakagePoint; }
+	public void setLeakagePoint(String leakagePoint) { this.leakagePoint = leakagePoint; }
 
 	@Size(min=0, max=200, message="泄露值单位长度不能超过 200 个字符")
 	public String getLeakValUnit() {

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

@@ -99,6 +99,10 @@ public class MesProductQmController extends BaseController {
 		if (testTimeLte != null) hfQuery.setCreateDate_lte(testTimeLte);
 
 		for (MesProductHf hf : mesProductHfService.findList(hfQuery)) {
+			if (StringUtils.isNotBlank(mesProductQm.getLeakagePoint())
+					&& !containsLeakPoint(hf.getHfFlag(), mesProductQm.getLeakagePoint())) {
+				continue;
+			}
 			MesProductQm record = new MesProductQm();
 			record.setId(hf.getId());
 			record.setComponentNum(hf.getSn());
@@ -106,7 +110,7 @@ public class MesProductQmController extends BaseController {
 			record.setOprno(hf.getOprno());
 			record.setWorkNum(hf.getCreateBy());
 			record.setTestTime(hf.getCreateDate());
-			record.setLeakVal(normalizeLeakPointLabels(hf.getHfFlag()));
+			record.setLeakagePoint(normalizeLeakPointLabels(hf.getHfFlag()));
 			record.setTestResult(hf.getResult());
 			record.setTitle("漏点标记");
 			records.add(record);
@@ -149,6 +153,16 @@ public class MesProductQmController extends BaseController {
 		return result.toString();
 	}
 
+	/** Matches a selected leakage point against a comma-separated client leak-point record. */
+	private boolean containsLeakPoint(String value, String selectedPoint) {
+		if (StringUtils.isBlank(value) || StringUtils.isBlank(selectedPoint)) return false;
+		String expected = selectedPoint.trim();
+		for (String item : normalizeLeakPointLabels(value).split(",")) {
+			if (expected.equalsIgnoreCase(item.trim())) return true;
+		}
+		return false;
+	}
+
 	/**
 	 * 查看编辑表单
 	 */

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

@@ -53,6 +53,12 @@
 					</div>
 				</div>
 				<div class="form-group">
+						<label class="control-label">${text('泄露点位')}：</label>
+					<div class="control-inline">
+						<#form:input path="leakagePoint" maxlength="100" 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>
@@ -77,6 +83,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("测试压")}', name:'testPressure', index:'a.test_pressure', width:150, align:"center"},
 		{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:'leakagePoint', width:150, align:"center"},
 		{header:'${text("泄露值单位")}', name:'leakValUnit', index:'a.leak_val_unit', width:150, 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"},