压铆数据提交

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

@@ -0,0 +1,15 @@
+package com.jeesite.modules.mes.dao;
+
+import com.jeesite.common.dao.CrudDao;
+import com.jeesite.common.mybatis.annotation.MyBatisDao;
+import com.jeesite.modules.mes.entity.MesProductProdVisual2;
+
+/**
+ * 产品压铆可视化数据表DAO接口
+ * @author mes
+ * @version 2026-06-12
+ */
+@MyBatisDao
+public interface MesProductProdVisual2Dao extends CrudDao<MesProductProdVisual2> {
+	
+}

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

@@ -0,0 +1,125 @@
+package com.jeesite.modules.mes.entity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+import com.jeesite.common.entity.DataEntity;
+import com.jeesite.common.mybatis.annotation.Column;
+import com.jeesite.common.mybatis.annotation.Table;
+import com.jeesite.common.mybatis.mapper.query.QueryType;
+import lombok.Getter;
+
+import java.util.List;
+
+/**
+ * 产品压铆可视化数据表Entity
+ * @author mes
+ * @version 2026-06-12
+ */
+@Table(name="mes_product_prod_visual2", alias="a", label="产品压铆可视化数据表信息", columns={
+		@Column(name="id", attrName="id", label="主键ID", isPK=true),
+		@Column(name="sn", attrName="sn", label="工件码"),
+		@Column(name="oprno", attrName="oprno", label="工位"),
+		@Column(name="line_sn", attrName="lineSn", label="产线编号"),
+		@Column(name="fout", attrName="fout", label="完成压力"),
+		@Column(name="sout", attrName="sout", label="完成位移"),
+		@Column(name="number", attrName="number", label="第几颗拉铆"),
+		@Column(name="result", attrName="result", label="结果"),
+		@Column(name="create_by", attrName="createBy", label="创建人", isUpdate=false, isQuery=false),
+		@Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isQuery=false, isUpdateForce=true),
+		@Column(name="update_by", attrName="updateBy", label="更新人", isQuery=false),
+		@Column(name="update_date", attrName="updateDate", label="更新时间", isQuery=false, isUpdateForce=true),
+	}, orderBy="a.update_date DESC"
+)
+public class MesProductProdVisual2 extends DataEntity<MesProductProdVisual2> {
+	
+	private static final long serialVersionUID = 1L;
+	private String sn;		// 工件码
+	private String oprno;		// 工位
+	private String lineSn;		// 产线编号
+	private String fout;		// 完成压力
+	private String sout;		// 完成位移
+	private String number;		// 第几颗拉铆
+	private String result;		// 结果
+	@Getter
+	private List<MesProductProdVisual2> datas;
+
+	public void setDatas(List<MesProductProdVisual2> datas) {
+		this.datas = datas;
+	}
+
+	public MesProductProdVisual2() {
+		this(null);
+	}
+	
+	public MesProductProdVisual2(String id){
+		super(id);
+	}
+	
+	@NotBlank(message="工件码不能为空")
+	@Size(min=0, max=100, message="工件码长度不能超过 100 个字符")
+	public String getSn() {
+		return sn;
+	}
+
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+	
+	@NotBlank(message="工位不能为空")
+	@Size(min=0, max=100, message="工位长度不能超过 100 个字符")
+	public String getOprno() {
+		return oprno;
+	}
+
+	public void setOprno(String oprno) {
+		this.oprno = oprno;
+	}
+	
+	@NotBlank(message="产线编号不能为空")
+	@Size(min=0, max=100, message="产线编号长度不能超过 100 个字符")
+	public String getLineSn() {
+		return lineSn;
+	}
+
+	public void setLineSn(String lineSn) {
+		this.lineSn = lineSn;
+	}
+	
+	@Size(min=0, max=32, message="完成压力长度不能超过 32 个字符")
+	public String getFout() {
+		return fout;
+	}
+
+	public void setFout(String fout) {
+		this.fout = fout;
+	}
+	
+	@Size(min=0, max=32, message="完成位移长度不能超过 32 个字符")
+	public String getSout() {
+		return sout;
+	}
+
+	public void setSout(String sout) {
+		this.sout = sout;
+	}
+	
+	@Size(min=0, max=16, message="第几颗拉铆长度不能超过 16 个字符")
+	public String getNumber() {
+		return number;
+	}
+
+	public void setNumber(String number) {
+		this.number = number;
+	}
+	
+	@Size(min=0, max=16, message="结果长度不能超过 16 个字符")
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+	
+}

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

@@ -0,0 +1,81 @@
+package com.jeesite.modules.mes.service;
+
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.service.CrudService;
+import com.jeesite.modules.mes.entity.MesProductProdVisual2;
+import com.jeesite.modules.mes.dao.MesProductProdVisual2Dao;
+
+/**
+ * 产品压铆可视化数据表Service
+ * @author mes
+ * @version 2026-06-12
+ */
+@Service
+public class MesProductProdVisual2Service extends CrudService<MesProductProdVisual2Dao, MesProductProdVisual2> {
+	
+	/**
+	 * 获取单条数据
+	 * @param mesProductProdVisual2
+	 * @return
+	 */
+	@Override
+	public MesProductProdVisual2 get(MesProductProdVisual2 mesProductProdVisual2) {
+		return super.get(mesProductProdVisual2);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesProductProdVisual2 查询条件
+	 * @param mesProductProdVisual2.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesProductProdVisual2> findPage(MesProductProdVisual2 mesProductProdVisual2) {
+		return super.findPage(mesProductProdVisual2);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesProductProdVisual2
+	 * @return
+	 */
+	@Override
+	public List<MesProductProdVisual2> findList(MesProductProdVisual2 mesProductProdVisual2) {
+		return super.findList(mesProductProdVisual2);
+	}
+	
+	/**
+	 * 保存数据（插入或更新）
+	 * @param mesProductProdVisual2
+	 */
+	@Override
+	@Transactional
+	public void save(MesProductProdVisual2 mesProductProdVisual2) {
+		super.save(mesProductProdVisual2);
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesProductProdVisual2
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesProductProdVisual2 mesProductProdVisual2) {
+		super.updateStatus(mesProductProdVisual2);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesProductProdVisual2
+	 */
+	@Override
+	@Transactional
+	public void delete(MesProductProdVisual2 mesProductProdVisual2) {
+		super.delete(mesProductProdVisual2);
+	}
+	
+}

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

@@ -0,0 +1,86 @@
+package com.jeesite.modules.mes.web;
+
+import java.util.List;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
+import com.jeesite.common.web.BaseController;
+import com.jeesite.modules.mes.entity.MesProductProdVisual2;
+import com.jeesite.modules.mes.service.MesProductProdVisual2Service;
+
+/**
+ * 产品压铆可视化数据表Controller
+ * @author mes
+ * @version 2026-06-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/mes/mesProductProdVisual2")
+public class MesProductProdVisual2Controller extends BaseController {
+
+	@Autowired
+	private MesProductProdVisual2Service mesProductProdVisual2Service;
+	
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesProductProdVisual2 get(String id, boolean isNewRecord) {
+		return mesProductProdVisual2Service.get(id, isNewRecord);
+	}
+	
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("mes:mesProductProdVisual2:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesProductProdVisual2 mesProductProdVisual2, Model model) {
+		model.addAttribute("mesProductProdVisual2", mesProductProdVisual2);
+		return "modules/mes/mesProductProdVisual2List";
+	}
+	
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("mes:mesProductProdVisual2:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesProductProdVisual2> listData(MesProductProdVisual2 mesProductProdVisual2, HttpServletRequest request, HttpServletResponse response) {
+		mesProductProdVisual2.setPage(new Page<>(request, response));
+		Page<MesProductProdVisual2> page = mesProductProdVisual2Service.findPage(mesProductProdVisual2);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("mes:mesProductProdVisual2:view")
+	@RequestMapping(value = "form")
+	public String form(MesProductProdVisual2 mesProductProdVisual2, Model model) {
+		model.addAttribute("mesProductProdVisual2", mesProductProdVisual2);
+		return "modules/mes/mesProductProdVisual2Form";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("mes:mesProductProdVisual2:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesProductProdVisual2 mesProductProdVisual2) {
+		mesProductProdVisual2Service.save(mesProductProdVisual2);
+		return renderResult(Global.TRUE, text("保存产品压铆可视化数据表成功！"));
+	}
+	
+}

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

@@ -3170,7 +3170,69 @@ public class MesProductRecordController extends BaseController {
 		return hashMap;
 
 	}
+@Autowired
+private MesProductProdVisual2Service mesProductProdVisual2Service;
+	/*压铆结果上传*/
+	@PostMapping(value = "yamao")
+	@ResponseBody
+	public 	HashMap<String, String> submityamao(HttpServletRequest request,
+											 @RequestBody MesProductProdVisual2 mesProductProdVisual2) {
+		HashMap<String, String> hashMap = new HashMap<>();
+		hashMap.put("Data", "null");
+		if (mesProductProdVisual2 == null || mesProductProdVisual2.getDatas()==null||StringUtils.isEmpty(mesProductProdVisual2.getSn())||
+				StringUtils.isEmpty(mesProductProdVisual2.getOprno())||
+				StringUtils.isEmpty(mesProductProdVisual2.getLineSn())) {
+			hashMap.put("Message", "参数为null");
+			hashMap.put("Result", "Fail");
+			return hashMap;
+		}
+		String oprno = mesProductProdVisual2.getOprno();
+		String sn = mesProductProdVisual2.getSn();
+		String lineSn = mesProductProdVisual2.getLineSn();
+		mesLogService.apisave2(oprno,lineSn,JSON.toJSONString(mesProductProdVisual2),request);
+
 
+		String userCode = "";
+		List<ParamsResp> params = new ArrayList<>();
+		try{
+			// 2.判断物料批次是否符合绑定
+			List<BindMaterialResp> bmlists = mesLineProcessMaterialService.getBindMaterial(oprno, lineSn);
+
+			mesProductRecordService.updateRecordResult(sn,oprno,"100000","","OK",userCode,params,lineSn,true,bmlists);
+		}catch (Exception e){
+			hashMap.put("Message", "参数为null");
+			hashMap.put("Result", "Fail");
+			return hashMap;
+		}
+
+
+		//添加扭力过程参数表
+		List<MesProductProdVisual2> list = mesProductProdVisual2.getDatas();
+		if (list!= null && list.size() > 0){
+			Date currentDate = new Date();
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String dateString = format.format(currentDate);
+			Date time=null;
+			try {
+				time = format.parse(dateString);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			for (MesProductProdVisual2 dtl : list) {
+				dtl.setOprno(oprno);
+				dtl.setSn(sn);
+				dtl.setLineSn(lineSn);
+				dtl.setCreateDate(time);
+//				dtl.setCreateBy(mesProductRecord.getCreateBy());
+				mesProductProdVisual2Service.save(dtl);
+			}
+		}
+
+		hashMap.put("Message", "上传成功");
+		hashMap.put("Result", "SUCCESS");
+		return hashMap;
+
+	}
 	@PostMapping(value = "checkProduct")
 	@ResponseBody
 	public CommonResp checkProduct(HttpServletRequest request) {

src/main/resources/config/application.yml

@@ -623,8 +623,9 @@ shiro:
     ${adminPath}/mes/mesProduct/screenData = anon
     ${adminPath}/mes/mesProductCcd/testDate = anon
     ${adminPath}/mes/mesProductCcd/add = anon
-      ${adminPath}/mes/mesProductRecord/result = anon
+    ${adminPath}/mes/mesProductRecord/result = anon
     ${adminPath}/mes/mesProductRecord/process  = anon
+    ${adminPath}/mes/mesProductRecord/yamao  = anon
     ${adminPath}/mes/mesProductRecord/currentProduct = anon
     ${adminPath}/mes/mesProductFsw/add = anon
     ${adminPath}/mes/mesProductProd/batchsave = anon

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

@@ -0,0 +1,15 @@
+<?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.MesProductProdVisual2Dao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesProductProdVisual2">
+		SELECT ${sqlMap.column.toSql()}
+		FROM ${sqlMap.table.toSql()}
+		<where>
+			${sqlMap.where.toSql()}
+		</where>
+		ORDER BY ${sqlMap.order.toSql()}
+	</select> -->
+	
+</mapper>

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

@@ -0,0 +1,109 @@
+<% layout('/layouts/default.html', {title: '产品压铆可视化数据表管理', libs: ['validate']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header with-border">
+			<div class="box-title">
+				<i class="fa icon-note"></i> ${text(mesProductProdVisual2.isNewRecord ? '新增产品压铆可视化数据表' : '编辑产品压铆可视化数据表')}
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+		<#form:form id="inputForm" model="${mesProductProdVisual2}" action="${ctx}/mes/mesProductProdVisual2/save" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">${text('基本信息')}</div>
+				<#form:hidden path="id"/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> ${text('工件码')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="sn" maxlength="100" class="form-control required"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> ${text('工位')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="oprno" maxlength="100" class="form-control required"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> ${text('产线编号')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="lineSn" maxlength="100" class="form-control required"/>
+							</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="fout" maxlength="32" 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="sout" maxlength="32" 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="number" maxlength="16" 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="result" maxlength="16" class="form-control"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+						<% if (hasPermi('mes:mesProductProdVisual2:edit')){ %>
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
+						<% } %>
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>
+					</div>
+				</div>
+			</div>
+		</#form:form>
+	</div>
+</div>
+<% } %>
+<script>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.result == Global.TRUE){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>

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

@@ -0,0 +1,103 @@
+<% 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>
+				<% if(hasPermi('mes:mesProductProdVisual2:edit')){ %>
+					<a href="${ctx}/mes/mesProductProdVisual2/form" class="btn btn-default btnTool" title="${text('新增产品压铆可视化数据表')}"><i class="fa fa-plus"></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="${mesProductProdVisual2}" action="${ctx}/mes/mesProductProdVisual2/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="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="oprno" 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="lineSn" 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="fout" maxlength="32" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('完成位移')}：</label>
+					<div class="control-inline">
+						<#form:input path="sout" maxlength="32" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('第几颗拉铆')}：</label>
+					<div class="control-inline">
+						<#form:input path="number" maxlength="16" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('结果')}：</label>
+					<div class="control-inline">
+						<#form:input path="result" maxlength="16" 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>
+			</#form:form>
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesProductProdVisual2/form?id='+row.id+'" class="btnList" data-title="${text("编辑产品压铆可视化数据表")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("工位")}', name:'oprno', index:'a.oprno', width:150, align:"left"},
+		{header:'${text("产线编号")}', name:'lineSn', index:'a.line_sn', width:150, align:"left"},
+		{header:'${text("完成压力")}', name:'fout', index:'a.fout', width:150, align:"left"},
+		{header:'${text("完成位移")}', name:'sout', index:'a.sout', width:150, align:"left"},
+		{header:'${text("第几颗拉铆")}', name:'number', index:'a.number', width:150, align:"left"},
+		{header:'${text("结果")}', name:'result', index:'a.result', width:150, align:"left"},
+		{header:'${text("创建人")}', name:'createBy', index:'a.create_by', width:150, align:"left"},
+		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
+		{header:'${text("更新人")}', name:'updateBy', index:'a.update_by', width:150, align:"left"},
+		{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('mes:mesProductProdVisual2:edit')){ %>
+				actions.push('<a href="${ctx}/mes/mesProductProdVisual2/form?id='+row.id+'" class="btnList" title="${text("编辑产品压铆可视化数据表")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>

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

@@ -122,14 +122,14 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("工位")}', name:'oprno', index:'a.oprno', width:150, align:"left"},
 		{header:'${text("产线编号")}', name:'lineSn', index:'a.line_sn', width:150, align:"left"},
-		{header:'${text("类型，A枪 B枪")}', name:'type', index:'a.type', width:150, align:"left"},
-		{header:'${text("f_out")}', name:'fout', index:'a.f_out', width:150, align:"left"},
-		{header:'${text("s_out")}', name:'sout', index:'a.s_out', width:150, align:"left"},
-		{header:'${text("f_min")}', name:'fmin', index:'a.f_min', width:150, align:"left"},
-		{header:'${text("s_min")}', name:'smin', index:'a.s_min', width:150, align:"left"},
-		{header:'${text("f_max")}', name:'fmax', index:'a.f_max', width:150, align:"left"},
-		{header:'${text("s_max")}', name:'smax', index:'a.s_max', width:150, align:"left"},
-		{header:'${text("number")}', name:'number', index:'a.number', width:150, align:"left"},
+		{header:'${text("枪")}', name:'type', index:'a.type', width:150, align:"left"},
+		{header:'${text("拉力")}', name:'fout', index:'a.f_out', width:150, align:"left"},
+		{header:'${text("位移")}', name:'sout', index:'a.s_out', width:150, align:"left"},
+		{header:'${text("拉力下限")}', name:'fmin', index:'a.f_min', width:150, align:"left"},
+		{header:'${text("位移下限")}', name:'smin', index:'a.s_min', width:150, align:"left"},
+		{header:'${text("拉力上限")}', name:'fmax', index:'a.f_max', width:150, align:"left"},
+		{header:'${text("位移上限")}', name:'smax', index:'a.s_max', width:150, align:"left"},
+		{header:'${text("第几颗")}', name:'number', index:'a.number', width:150, align:"left"},
 		{header:'${text("拉铆时间")}', name:'dateTime', index:'a.date_time', width:150, align:"center"},
 		{header:'${text("工作人员")}', name:'createBy', index:'a.create_by', width:150, align:"left"},
 		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},