db/menu_dump.txt

@@ -0,0 +1,11 @@
+lineTitle	lineSn	oprno	title	pid	outputCount
+XT	XT	OP060A	切割打磨	2066721003667562496	680
+XT	XT	OP070A	X光探伤	2066721120843833344	225
+XT	XT	OP080A	热处理T5	2066721310644477952	644
+XT	XT	OP090A	检验&整形	2066721479188389888	598
+XT	XT	OP100A	毛坯入库	2066757943422406656	588
+XT	XT	OP110A	机加工一序	2077639186612449280	118
+XT	XT	OP110B	机加工一序	2077639186612449280	119
+XT	XT	OP120A	氩弧焊中间横梁	2077639740747116544	239
+XT	XT	OP130A	机加工二序	2077640264024289280	135
+XT	XT	OP130B	机加工二序	2077640264024289280	127

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

@@ -0,0 +1,39 @@
+package com.jeesite.modules.mes.dao;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 产线产能管理DAO接口
+ * @author mes
+ * @version 2026-10-30
+ */
+@MyBatisDao
+public interface MesLineCapacityDao {
+
+	/**
+	 * 按工位汇总指定时间段内的产量
+	 */
+	List<Map<String, Object>> findCapacityList(
+			@Param("lineId") String lineId,
+			@Param("lineSn") String lineSn,
+			@Param("oprno") String oprno,
+			@Param("title") String title,
+			@Param("startTime") Date startTime,
+			@Param("endTime") Date endTime,
+			@Param("offset") int offset,
+			@Param("limit") int limit);
+
+	/**
+	 * 统计符合条件的工位数量
+	 */
+	long findCapacityCount(
+			@Param("lineId") String lineId,
+			@Param("lineSn") String lineSn,
+			@Param("oprno") String oprno,
+			@Param("title") String title);
+}

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

@@ -0,0 +1,100 @@
+package com.jeesite.modules.mes.entity;
+
+/**
+ * 产线产能管理查询对象（按工位汇总生产记录）
+ * @author mes
+ * @version 2026-10-30
+ */
+public class MesLineCapacity {
+
+	private String lineId;			// 生产线id
+	private String lineSn;			// 产线编号
+	private String lineTitle;		// 生产线名称
+	private String oprno;			// 工位号
+	private String title;			// 工位名称
+	private String pid;				// 父级工位id
+	private Integer sorts;			// 工位排序
+	private Long outputCount;		// 产量
+	private String startDate;		// 统计开始时间
+	private String endDate;			// 统计结束时间
+
+	public String getLineId() {
+		return lineId;
+	}
+
+	public void setLineId(String lineId) {
+		this.lineId = lineId;
+	}
+
+	public String getLineSn() {
+		return lineSn;
+	}
+
+	public void setLineSn(String lineSn) {
+		this.lineSn = lineSn;
+	}
+
+	public String getLineTitle() {
+		return lineTitle;
+	}
+
+	public void setLineTitle(String lineTitle) {
+		this.lineTitle = lineTitle;
+	}
+
+	public String getOprno() {
+		return oprno;
+	}
+
+	public void setOprno(String oprno) {
+		this.oprno = oprno;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	public Integer getSorts() {
+		return sorts;
+	}
+
+	public void setSorts(Integer sorts) {
+		this.sorts = sorts;
+	}
+
+	public Long getOutputCount() {
+		return outputCount;
+	}
+
+	public void setOutputCount(Long outputCount) {
+		this.outputCount = outputCount;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+}

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

@@ -0,0 +1,31 @@
+package com.jeesite.modules.mes.service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jeesite.modules.mes.dao.MesLineCapacityDao;
+
+/**
+ * 产线产能管理Service
+ * @author mes
+ * @version 2026-10-30
+ */
+@Service
+public class MesLineCapacityService {
+
+	@Autowired
+	private MesLineCapacityDao mesLineCapacityDao;
+
+	public List<Map<String, Object>> findCapacityList(String lineId, String lineSn, String oprno, String title,
+			Date startTime, Date endTime, int offset, int limit) {
+		return mesLineCapacityDao.findCapacityList(lineId, lineSn, oprno, title, startTime, endTime, offset, limit);
+	}
+
+	public long findCapacityCount(String lineId, String lineSn, String oprno, String title) {
+		return mesLineCapacityDao.findCapacityCount(lineId, lineSn, oprno, title);
+	}
+}

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

@@ -0,0 +1,161 @@
+package com.jeesite.modules.mes.web;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+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.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.mes.entity.MesLine;
+import com.jeesite.modules.mes.entity.MesLineCapacity;
+import com.jeesite.modules.mes.req.MesSearchDateReq;
+import com.jeesite.modules.mes.service.MesLineCapacityService;
+import com.jeesite.modules.mes.service.MesLineService;
+import com.jeesite.modules.mes.util.CommonUitl;
+
+/**
+ * 产线产能管理Controller
+ * @author mes
+ * @version 2026-10-30
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/mes/mesLineCapacity")
+public class MesLineCapacityController extends BaseController {
+
+	private static final String DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+	private static final String MINUTE_PATTERN = "yyyy-MM-dd HH:mm";
+	private static final String DATE_PATTERN = "yyyy-MM-dd";
+
+	@Autowired
+	private MesLineCapacityService mesLineCapacityService;
+
+	@Autowired
+	private MesLineService mesLineService;
+
+	/**
+	 * 查询列表（默认统计最近 7 天，与生产记录管理等页面的默认查询区间一致）
+	 */
+	@RequiresPermissions("mes:mesLineCapacity:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesLineCapacity mesLineCapacity, Model model) {
+		if (StringUtils.isBlank(mesLineCapacity.getStartDate()) && StringUtils.isBlank(mesLineCapacity.getEndDate())) {
+			Date[] defaultRange = getDefaultDateRange();
+			SimpleDateFormat sdf = new SimpleDateFormat(MINUTE_PATTERN);
+			mesLineCapacity.setStartDate(sdf.format(defaultRange[0]));
+			mesLineCapacity.setEndDate(sdf.format(defaultRange[1]));
+		}
+		model.addAttribute("mesLineCapacity", mesLineCapacity);
+		model.addAttribute("lineList", mesLineService.findList(new MesLine()));
+		return "modules/mes/mesLineCapacityList";
+	}
+
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("mes:mesLineCapacity:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<Map<String, Object>> listData(MesLineCapacity mesLineCapacity, HttpServletRequest request,
+			HttpServletResponse response) {
+		Page<Map<String, Object>> page = new Page<>(request, response);
+
+		Date startTime = parseDate(mesLineCapacity.getStartDate(), false);
+		Date endTime = parseDate(mesLineCapacity.getEndDate(), true);
+		if (startTime == null && endTime == null) {
+			Date[] defaultRange = getDefaultDateRange();
+			startTime = defaultRange[0];
+			endTime = defaultRange[1];
+		} else if (startTime == null) {
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(endTime);
+			calendar.add(Calendar.DAY_OF_MONTH, -1);
+			startTime = calendar.getTime();
+		} else if (endTime == null) {
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(startTime);
+			calendar.add(Calendar.DAY_OF_MONTH, 1);
+			endTime = calendar.getTime();
+		}
+		if (!endTime.after(startTime)) {
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(startTime);
+			calendar.add(Calendar.DAY_OF_MONTH, 1);
+			endTime = calendar.getTime();
+		}
+
+		int pageNo = page.getPageNo() < 1 ? 1 : page.getPageNo();
+		int pageSize = page.getPageSize() < 1 ? 20 : page.getPageSize();
+		int offset = (pageNo - 1) * pageSize;
+
+		List<Map<String, Object>> list = mesLineCapacityService.findCapacityList(
+				StringUtils.trimToEmpty(mesLineCapacity.getLineId()),
+				StringUtils.trimToEmpty(mesLineCapacity.getLineSn()),
+				StringUtils.trimToEmpty(mesLineCapacity.getOprno()),
+				StringUtils.trimToEmpty(mesLineCapacity.getTitle()),
+				startTime, endTime, offset, pageSize);
+		long count = mesLineCapacityService.findCapacityCount(
+				StringUtils.trimToEmpty(mesLineCapacity.getLineId()),
+				StringUtils.trimToEmpty(mesLineCapacity.getLineSn()),
+				StringUtils.trimToEmpty(mesLineCapacity.getOprno()),
+				StringUtils.trimToEmpty(mesLineCapacity.getTitle()));
+
+		page.setCount((int) count);
+		page.setList(list);
+		return page;
+	}
+
+	/**
+	 * 默认统计区间：最近 N 天（N 由配置 mes.search.days 控制，默认 7）
+	 * 与生产记录管理、探伤记录等页面的默认查询区间保持一致
+	 */
+	private Date[] getDefaultDateRange() {
+		MesSearchDateReq dateMap = CommonUitl.getSearchDate();
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(dateMap.getEndtDate());
+		calendar.set(Calendar.SECOND, 59);
+		calendar.set(Calendar.MILLISECOND, 0);
+		return new Date[] { dateMap.getStartDate(), calendar.getTime() };
+	}
+
+	/**
+	 * 解析查询时间，支持 yyyy-MM-dd HH:mm:ss、yyyy-MM-dd HH:mm、yyyy-MM-dd
+	 */
+	private Date parseDate(String value, boolean isEnd) {
+		if (StringUtils.isBlank(value)) {
+			return null;
+		}
+		String text = value.trim();
+		String[] patterns = new String[] {DATETIME_PATTERN, MINUTE_PATTERN, DATE_PATTERN};
+		for (String pattern : patterns) {
+			try {
+				SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+				sdf.setLenient(false);
+				Date date = sdf.parse(text);
+				if (isEnd && DATE_PATTERN.equals(pattern)) {
+					Calendar calendar = Calendar.getInstance();
+					calendar.setTime(date);
+					calendar.add(Calendar.DAY_OF_MONTH, 1);
+					return calendar.getTime();
+				}
+				return date;
+			} catch (ParseException e) {
+				// 尝试下一种格式
+			}
+		}
+		return null;
+	}
+}

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

@@ -98,11 +98,23 @@ public class MesMaterialCheckRecordController extends BaseController {
 	@RequestMapping(value = "listData")
 	@ResponseBody
 	public Page<MesMaterialCheckRecord> listData(MesMaterialCheckRecord mesMaterialCheckRecord, HttpServletRequest request, HttpServletResponse response) {
+		applySnLikeQuery(mesMaterialCheckRecord);
 		mesMaterialCheckRecord.setPage(new Page<>(request, response));
 		Page<MesMaterialCheckRecord> page = mesMaterialCheckRecordService.findPage(mesMaterialCheckRecord);
 		return page;
 	}
 
+	/**
+	 * 来料码改为模糊查询（仅用于列表查询/导出，PDA 扫码入库走 findInfo 精确匹配，不受影响）
+	 */
+	private void applySnLikeQuery(MesMaterialCheckRecord mesMaterialCheckRecord) {
+		String sn = mesMaterialCheckRecord.getSn();
+		if (StringUtils.isNotBlank(sn)) {
+			mesMaterialCheckRecord.setSn(null);
+			mesMaterialCheckRecord.getSqlMap().getWhere().and("a.sn", QueryType.LIKE, sn);
+		}
+	}
+
 
 	/**
 	 * 导出数据
@@ -110,6 +122,7 @@ public class MesMaterialCheckRecordController extends BaseController {
 	@RequiresPermissions("mes:mesMaterialCheckRecord:view")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesMaterialCheckRecord mesMaterialCheckRecord, HttpServletResponse response) {
+		applySnLikeQuery(mesMaterialCheckRecord);
 		List<MesMaterialCheckRecord> list = mesMaterialCheckRecordService.findList(mesMaterialCheckRecord);
 		String fileName = "来料检查记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try (ExcelExport ee = new ExcelExport("来料检查记录", MesMaterialCheckRecord.class)) {
@@ -315,6 +328,29 @@ public class MesMaterialCheckRecordController extends BaseController {
 		map.put("result", result);
 		map.put("info", ma);
 		map.put("mitList", mitList);
+
+		// 取工件码第4段（物料编码）到“来料检查记录”做模糊查询，按检查日期取最新一条，
+		// 不合格数量为0显示“合格”，否则显示“不合格”
+		MesMaterialCheckRecord latestCheckRecord = null;
+		if (StringUtils.isNotBlank(result[3])) {
+			MesMaterialCheckRecord historyQuery = new MesMaterialCheckRecord();
+			historyQuery.setStatus(MesMaterialCheckRecord.STATUS_NORMAL);
+			historyQuery.getSqlMap().getWhere().and("a.sn", QueryType.LIKE, result[3].trim());
+			historyQuery.getSqlMap().getOrder().setOrderBy("a.create_date DESC");
+			latestCheckRecord = mesMaterialCheckRecordService.findInfo(historyQuery);
+		}
+		String inspectLevel = "";
+		if (latestCheckRecord != null) {
+			double bhgQtyValue = 0D;
+			try {
+				bhgQtyValue = Double.parseDouble(StringUtils.defaultIfBlank(latestCheckRecord.getBhgQty(), "0").trim());
+			} catch (NumberFormatException e) {
+				bhgQtyValue = 0D;
+			}
+			inspectLevel = bhgQtyValue == 0D ? "合格" : "不合格";
+		}
+		map.put("inspectLevel", inspectLevel);
+
 		resp.setData(map);
 		resp.setResult(Global.TRUE);
 		return resp;

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

@@ -25,6 +25,7 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.DateUtils;
+import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.common.utils.excel.ExcelExport;
 import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
 import org.springframework.web.multipart.MultipartFile;
@@ -89,12 +90,24 @@ public class MesMaterialReportController extends BaseController {
 	@RequestMapping(value = "listData")
 	@ResponseBody
 	public Page<MesMaterialReport> listData(MesMaterialReport mesMaterialReport, HttpServletRequest request, HttpServletResponse response) {
+		applySnLikeQuery(mesMaterialReport);
 		mesMaterialReport.setPage(new Page<>(request, response));
 		Page<MesMaterialReport> page = mesMaterialReportService.findPage(mesMaterialReport);
 		return page;
 	}
 
 	/**
+	 * 来料码改为模糊查询（仅用于列表查询/导出，PDA 扫码相关逻辑仍走精确匹配，不受影响）
+	 */
+	private void applySnLikeQuery(MesMaterialReport mesMaterialReport) {
+		String sn = mesMaterialReport.getSn();
+		if (StringUtils.isNotBlank(sn)) {
+			mesMaterialReport.setSn(null);
+			mesMaterialReport.getSqlMap().getWhere().and("a.sn", QueryType.LIKE, sn);
+		}
+	}
+
+	/**
 	 * 查看编辑表单
 	 */
 	@RequiresPermissions("mes:mesMaterialReport:view")
@@ -121,6 +134,7 @@ public class MesMaterialReportController extends BaseController {
 	@RequiresPermissions("mes:mesMaterialReport:view")
 	@RequestMapping(value = "exportData")
 	public void exportData(MesMaterialReport mesMaterialReport, HttpServletResponse response) {
+		applySnLikeQuery(mesMaterialReport);
 		List<MesMaterialReport> list = mesMaterialReportService.findList(mesMaterialReport);
 		String fileName = "来料报检" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try(ExcelExport ee = new ExcelExport("来料报检", MesMaterialReport.class)){

src/main/resources/mappings/modules/mes/MesLineCapacityDao.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeesite.modules.mes.dao.MesLineCapacityDao">
+
+    <!-- 主工位（pid 为空的为工位，pid 不为空的是其子工位）基础条件 -->
+    <sql id="capacityWhere">
+        WHERE lp.status = '0'
+          AND ml.status = '0'
+          AND lp.pid IS NULL
+        <if test="lineId != null and lineId != ''">
+            AND ml.id = #{lineId}
+        </if>
+        <if test="lineSn != null and lineSn != ''">
+            AND ml.sn = #{lineSn}
+        </if>
+        <if test="oprno != null and oprno != ''">
+            AND lp.oprno LIKE CONCAT('%', #{oprno}, '%')
+        </if>
+        <if test="title != null and title != ''">
+            AND lp.title LIKE CONCAT('%', #{title}, '%')
+        </if>
+    </sql>
+
+    <!--
+        按主工位统计产量：口径与产线大屏“实际产能”一致（工艺号 100000 且结果不为 UDF）。
+        生产记录的工位号可能带子工位后缀（如 OP060A、OP110B），统一按前 5 位（OPxxx）归并到主工位，
+        避免主工位、子工位重复统计。
+    -->
+    <select id="findCapacityList" resultType="java.util.LinkedHashMap">
+        SELECT
+            ml.title AS lineTitle,
+            ml.sn AS lineSn,
+            lp.oprno AS oprno,
+            lp.title AS title,
+            lp.sorts AS sorts,
+            IFNULL(t.outputCount, 0) AS outputCount
+        FROM mes_line_process lp
+        INNER JOIN mes_line ml ON ml.id = lp.line_id
+        LEFT JOIN (
+            SELECT pr.line_sn AS lineSn, LEFT(pr.oprno, 5) AS oprno, COUNT(1) AS outputCount
+            FROM mes_product_record pr
+            WHERE pr.update_date <![CDATA[ >= ]]> #{startTime}
+              AND pr.update_date <![CDATA[ < ]]> #{endTime}
+              AND pr.craft = '100000'
+              AND UPPER(TRIM(IFNULL(pr.content, ''))) <![CDATA[ <> ]]> 'UDF'
+            GROUP BY pr.line_sn, LEFT(pr.oprno, 5)
+        ) t ON t.lineSn = ml.sn AND t.oprno = lp.oprno
+        <include refid="capacityWhere"/>
+        ORDER BY ml.sn ASC, IFNULL(lp.sorts, 0) ASC, lp.oprno ASC
+        LIMIT #{offset}, #{limit}
+    </select>
+
+    <select id="findCapacityCount" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM mes_line_process lp
+        INNER JOIN mes_line ml ON ml.id = lp.line_id
+        <include refid="capacityWhere"/>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,77 @@
+<% 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('产线产能管理')}
+			</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="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
+			</div>
+		</div>
+		<div class="box-body">
+			<#form:form id="searchForm" model="${mesLineCapacity}" action="${ctx}/mes/mesLineCapacity/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 width-120">
+						<#form:select path="lineId" items="${lineList}" itemLabel="title" itemValue="id" blankOption="true" class="form-control width-120" />
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('工位号')}：</label>
+					<div class="control-inline">
+						<#form:input path="oprno" 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="title" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('统计时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="startDate" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="endDate.click()"/>
+						&nbsp;-&nbsp;
+						<#form:input path="endDate" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</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>
+			</#form:form>
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+			<p class="help-block" style="margin:10px 0 0 5px;">
+				${text('统计口径：按主工位统计生产记录（工艺号 100000 且结果不为 UDF）的完成数量，子工位（如 OP110A/OP110B）的产量并入所属主工位，产量单位为“件”。默认统计最近 7 天（可在 mes.search.days 配置）。')}
+			</p>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	pageSize: 50,
+	columnModel: [
+		{header:'${text("生产线")}', name:'lineTitle', index:'ml.title', width:180, align:"center", frozen:true},
+		{header:'${text("产线编号")}', name:'lineSn', index:'ml.sn', width:100, align:"center", frozen:true},
+		{header:'${text("工位号")}', name:'oprno', index:'lp.oprno', width:120, align:"center", frozen:true},
+		{header:'${text("工位名称")}', name:'title', index:'lp.title', width:220, align:"center"},
+		{header:'${text("产量（件）")}', name:'outputCount', index:'outputCount', width:120, align:"right", formatter: function(val, obj, row, act){
+			return '<strong>' + (Number(val) || 0) + '</strong>';
+		}}
+	],
+	frozenCols: true,
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+	}
+});
+</script>

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

@@ -32,6 +32,9 @@
 					</div>
 				<input type="hidden" name="checkList" id="checkList">
 				<div v-if="is_show">
+					<div class="form-unit" v-if="inspectLevel">
+						${text('加严检验')}：{{inspectLevel}}
+					</div>
 					<div class="form-unit">${text('物料信息')}</div>
 					<div class="col-xs-12">
 						<div class="form-group">
@@ -239,6 +242,7 @@ var vm = new Vue({
 		faNums:0,
 		hgQty:"",
 		bhgQty:"",
+		inspectLevel:"",
 		state:"1",
 		options:[]
 	},
@@ -406,6 +410,7 @@ var vm = new Vue({
 					that.faNums=0;
 					that.hgQty="";
 					that.bhgQty="";
+					that.inspectLevel="";
 					that.options=[];
 					that.formatData();
 				}else {
@@ -418,6 +423,7 @@ var vm = new Vue({
 					that.faNums=res.data.faNums || snFields.faNums;
 					that.hgQty=that.faNums;
 					that.bhgQty=0;
+					that.inspectLevel=res.data.inspectLevel || "";
 					that.options=res.data.mitList;
 
 					for (let o in that.options){