半成品入库

src/main/java/com/jeesite/modules/mes/dao/MesProductProgressDao.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.MesProductProgress;
+
+/**
+ * 半成品仓库表DAO接口
+ * @author jingbo
+ * @version 2026-05-27
+ */
+@MyBatisDao
+public interface MesProductProgressDao extends CrudDao<MesProductProgress> {
+	
+}

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

@@ -0,0 +1,119 @@
+package com.jeesite.modules.mes.entity;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
+import com.jeesite.common.mybatis.annotation.JoinTable;
+import com.jeesite.common.mybatis.annotation.JoinTable.Type;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+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;
+
+/**
+ * 半成品仓库表Entity
+ * @author jingbo
+ * @version 2026-05-27
+ */
+@Table(name="mes_product_progress", alias="a", label="半成品仓库表信息", columns={
+		@Column(name="id", attrName="id", label="主键", isPK=true),
+		@Column(name="sn", attrName="sn", label="工件码"),
+		@Column(name="line_sn", attrName="lineSn", label="产线编号"),
+		@Column(name="entry_time", attrName="entryTime", label="入库时间", isUpdateForce=true),
+		@Column(name="kw_id", attrName="kwId", label="库位ID"),
+		@Column(name="state", attrName="state", label="状态", comment="状态（0.已入库；1.已出库）"),
+		@Column(name="remark", attrName="remark", label="备注"),
+		@Column(name="create_by", attrName="createBy", label="create_by", isUpdate=false, isQuery=false),
+		@Column(name="create_date", attrName="createDate", label="create_date", isUpdate=false, isQuery=false, isUpdateForce=true),
+		@Column(name="update_by", attrName="updateBy", label="update_by", isQuery=false),
+		@Column(name="update_date", attrName="updateDate", label="更新日期", isQuery=false, isUpdateForce=true),
+	}, joinTable={
+		@JoinTable(type=Type.LEFT_JOIN, entity=MesMaterialKw.class, attrName="this", alias="kw",
+			on="a.kw_id = kw.id", columns={
+				@Column(name="title", attrName="kwName", label="库位名称")
+		})
+	}, orderBy="a.update_date DESC"
+)
+public class MesProductProgress extends DataEntity<MesProductProgress> {
+	
+	private static final long serialVersionUID = 1L;
+	private String sn;		// 工件码
+	private String lineSn;		// 产线编号
+	private Date entryTime;		// 入库时间
+	private String kwId;		// 库位ID
+	private String kwName;		// 库位名称
+	private String state;		// 状态（0.已入库；1.已出库）
+	private String remark;		// 备注
+
+	public MesProductProgress() {
+		this(null);
+	}
+	
+	public MesProductProgress(String id){
+		super(id);
+	}
+	
+	@Size(min=0, max=50, message="工件码长度不能超过 50 个字符")
+	public String getSn() {
+		return sn;
+	}
+
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+	
+	@Size(min=0, max=30, message="产线编号长度不能超过 30 个字符")
+	public String getLineSn() {
+		return lineSn;
+	}
+
+	public void setLineSn(String lineSn) {
+		this.lineSn = lineSn;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getEntryTime() {
+		return entryTime;
+	}
+
+	public void setEntryTime(Date entryTime) {
+		this.entryTime = entryTime;
+	}
+	
+	@Size(min=0, max=64, message="库位ID长度不能超过 64 个字符")
+	public String getKwId() {
+		return kwId;
+	}
+
+	public void setKwId(String kwId) {
+		this.kwId = kwId;
+	}
+
+	public String getKwName() {
+		return kwName;
+	}
+
+	public void setKwName(String kwName) {
+		this.kwName = kwName;
+	}
+
+	@Size(min=0, max=1, message="状态长度不能超过 1 个字符")
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+	
+	@Size(min=0, max=255, message="备注长度不能超过 255 个字符")
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+}

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

@@ -0,0 +1,94 @@
+package com.jeesite.modules.mes.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.MesProductProgress;
+import com.jeesite.modules.mes.dao.MesProductProgressDao;
+
+/**
+ * 半成品仓库表Service
+ * @author jingbo
+ * @version 2026-05-27
+ */
+@Service
+public class MesProductProgressService extends CrudService<MesProductProgressDao, MesProductProgress> {
+
+
+	@Autowired
+	private MesProductProgressDao mesProductProgressDao;
+
+	/**
+	 * 获取单条数据
+	 * @param mesProductProgress
+	 * @return
+	 */
+	@Override
+	public MesProductProgress get(MesProductProgress mesProductProgress) {
+		return super.get(mesProductProgress);
+	}
+	
+	/**
+	 * 查询分页数据
+	 * @param mesProductProgress 查询条件
+	 * @param mesProductProgress.page 分页对象
+	 * @return
+	 */
+	@Override
+	public Page<MesProductProgress> findPage(MesProductProgress mesProductProgress) {
+		return super.findPage(mesProductProgress);
+	}
+	
+	/**
+	 * 查询列表数据
+	 * @param mesProductProgress
+	 * @return
+	 */
+	@Override
+	public List<MesProductProgress> findList(MesProductProgress mesProductProgress) {
+		return super.findList(mesProductProgress);
+	}
+	
+	/**
+	 * 保存数据（插入或更新）
+	 * @param mesProductProgress
+	 */
+	@Override
+	@Transactional
+	public void save(MesProductProgress mesProductProgress) {
+		super.save(mesProductProgress);
+	}
+	
+	/**
+	 * 更新状态
+	 * @param mesProductProgress
+	 */
+	@Override
+	@Transactional
+	public void updateStatus(MesProductProgress mesProductProgress) {
+		super.updateStatus(mesProductProgress);
+	}
+	
+	/**
+	 * 删除数据
+	 * @param mesProductProgress
+	 */
+	@Override
+	@Transactional
+	public void delete(MesProductProgress mesProductProgress) {
+		super.delete(mesProductProgress);
+	}
+
+	/*
+	* 根据sn、lineSn查询数据
+	 */
+	public MesProductProgress getBySnAndLineSn(MesProductProgress mesProductProgress) {
+		return mesProductProgressDao.getByEntity(mesProductProgress);
+	}
+	
+}

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

@@ -79,7 +79,7 @@ public class MesMaterialKwController extends BaseController {
 		return renderResult(Global.TRUE, text("删除来料检查物料库位表成功！"));
 	}
 
-	@RequiresPermissions("mes:mesMaterialRkRecord:api")
+
 	@RequestMapping(value = "kwList")
 	@ResponseBody
 	public CommonResp kwList(HttpServletRequest req) {

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

@@ -0,0 +1,155 @@
+package com.jeesite.modules.mes.web;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jeesite.common.lang.StringUtils;
+import com.jeesite.modules.mes.resp.CommonResp;
+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.util.ObjectUtils;
+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.MesProductProgress;
+import com.jeesite.modules.mes.entity.MesMaterialKw;
+import com.jeesite.modules.mes.service.MesProductProgressService;
+import com.jeesite.modules.mes.service.MesMaterialKwService;
+
+/**
+ * 半成品仓库表Controller
+ * @author jingbo
+ * @version 2026-05-27
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/mes/mesProductProgress")
+public class MesProductProgressController extends BaseController {
+
+	@Autowired
+	private MesProductProgressService mesProductProgressService;
+	@Autowired
+	private MesMaterialKwService mesMaterialKwService;
+	
+	/**
+	 * 获取数据
+	 */
+	@ModelAttribute
+	public MesProductProgress get(String id, boolean isNewRecord) {
+		return mesProductProgressService.get(id, isNewRecord);
+	}
+	
+	/**
+	 * 查询列表
+	 */
+	@RequiresPermissions("mes:mesProductProgress:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(MesProductProgress mesProductProgress, Model model) {
+		model.addAttribute("mesProductProgress", mesProductProgress);
+		model.addAttribute("kwList", mesMaterialKwService.findList(new MesMaterialKw()));
+		return "modules/mes/mesProductProgressList";
+	}
+	
+	/**
+	 * 查询列表数据
+	 */
+	@RequiresPermissions("mes:mesProductProgress:view")
+	@RequestMapping(value = "listData")
+	@ResponseBody
+	public Page<MesProductProgress> listData(MesProductProgress mesProductProgress, HttpServletRequest request, HttpServletResponse response) {
+		mesProductProgress.setPage(new Page<>(request, response));
+		Page<MesProductProgress> page = mesProductProgressService.findPage(mesProductProgress);
+		return page;
+	}
+
+	/**
+	 * 查看编辑表单
+	 */
+	@RequiresPermissions("mes:mesProductProgress:view")
+	@RequestMapping(value = "form")
+	public String form(MesProductProgress mesProductProgress, Model model) {
+		model.addAttribute("mesProductProgress", mesProductProgress);
+		model.addAttribute("kwList", mesMaterialKwService.findList(new MesMaterialKw()));
+		return "modules/mes/mesProductProgressForm";
+	}
+
+	/**
+	 * 保存数据
+	 */
+	@RequiresPermissions("mes:mesProductProgress:edit")
+	@PostMapping(value = "save")
+	@ResponseBody
+	public String save(@Validated MesProductProgress mesProductProgress) {
+		mesProductProgressService.save(mesProductProgress);
+		return renderResult(Global.TRUE, text("保存半成品仓库表成功！"));
+	}
+	
+	/**
+	 * 删除数据
+	 */
+	@RequiresPermissions("mes:mesProductProgress:edit")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public String delete(MesProductProgress mesProductProgress) {
+		mesProductProgressService.delete(mesProductProgress);
+		return renderResult(Global.TRUE, text("删除半成品仓库表成功！"));
+	}
+
+	/**
+	 * pda扫码入库
+	 *
+	 */
+	@PostMapping(value = "pdaIn")
+	@ResponseBody
+	public CommonResp pdaIn(HttpServletRequest request) {
+		CommonResp resp = new CommonResp<>();
+		//获取参数
+		String kwId = request.getParameter("kwId");
+		String sn = request.getParameter("sn");
+		String lineSn = request.getParameter("lineSn");
+		if (StringUtils.isEmpty(lineSn) || StringUtils.isEmpty(sn) || StringUtils.isEmpty(kwId)){
+			resp.setResult(Global.FALSE);
+			resp.setMessage("参数错误");
+			return resp;
+		}
+		MesProductProgress mesProductProgress = new MesProductProgress();
+		mesProductProgress.setKwId(kwId);
+		mesProductProgress.setSn(sn);
+		mesProductProgress.setLineSn(lineSn);
+		// 查询是否存在
+		MesProductProgress mesProductProgress1 = mesProductProgressService.getBySnAndLineSn(mesProductProgress);
+		if (!ObjectUtils.isEmpty(mesProductProgress1)){
+			if ("0".equals(mesProductProgress1.getState())){
+				resp.setResult(Global.FALSE);
+				resp.setMessage("该工件已入库");
+				return resp;
+			}
+			if ("1".equals(mesProductProgress1.getState())){
+				resp.setResult(Global.FALSE);
+				resp.setMessage("该工件已出库");
+				return resp;
+			}
+		}else {
+			mesProductProgress.setState("0");
+			mesProductProgressService.save(mesProductProgress);
+			resp.setResult(Global.TRUE);
+			resp.setMessage("入库成功");
+			return resp;
+		}
+		resp.setResult(Global.FALSE);
+		resp.setMessage("入库失败");
+		return resp;
+	}
+
+
+
+	
+}

src/main/resources/config/application.yml

@@ -702,6 +702,8 @@ shiro:
     ${adminPath}/mes/mesProductRecord/getCurSn= anon
     ${adminPath}/mes/mesProductRecord/cancelCurSn= anon
     ${adminPath}/mes/mesProductRecord/ocr= anon
+    ${adminPath}/mes/mesProductProgress/pdaIn= anon
+    ${adminPath}/mes/mesMaterialKw/kwList= anon
     ${adminPath}/** = user
 
 
@@ -883,9 +885,9 @@ web:
   #  strictMode: false
   #
   #  # 自定义正则表达式验证（主键、登录名）
-  #  validator:
-  #    id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
-  #    user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{4,20}'
+    validator:
+      id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
+      user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{1,20}'
   #
   #  # 默认的日期格式（JsonMapper）
   #  json:

src/main/resources/mappings/modules/mes/MesProductProgressDao.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.MesProductProgressDao">
+	
+	<!-- 查询数据
+	<select id="findList" resultType="MesProductProgress">
+		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/mesProductProgressForm.html

@@ -0,0 +1,101 @@
+<% 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(mesProductProgress.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="${mesProductProgress}" action="${ctx}/mes/mesProductProgress/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 hide">*</span> ${text('工件码')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="sn" maxlength="50" 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="lineSn" maxlength="30" 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="entryTime" readonly="true" maxlength="20" class="form-control laydate"-->
+<!--									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>-->
+<!--							</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:select path="kwId" items="${kwList}" itemLabel="title" itemValue="id" blankOption="true" 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:select path="state" dictType="mes_progress_status" blankOption="true" 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="remark" maxlength="255" 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:mesProductProgress: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/mesProductProgressList.html

@@ -0,0 +1,97 @@
+<% 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:mesProductProgress:edit')){ %>
+					<a href="${ctx}/mes/mesProductProgress/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="${mesProductProgress}" action="${ctx}/mes/mesProductProgress/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="50" 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="30" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('入库时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="entryTime" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('库位')}：</label>
+					<div class="control-inline">
+						<#form:select path="kwId" items="${kwList}" 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 width-120">
+						<#form:select path="state" dictType="mes_progress_status" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('备注')}：</label>
+					<div class="control-inline">
+						<#form:input path="remark" maxlength="255" 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/mesProductProgress/form?id='+row.id+'" class="btnList" data-title="${text("编辑半成品仓库表")}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text("产线编号")}', name:'lineSn', index:'a.line_sn', width:150, align:"left"},
+		{header:'${text("入库时间")}', name:'entryTime', index:'a.entry_time', width:150, align:"center"},
+		{header:'${text("库位")}', name:'kwName', index:'kw.title', width:150, align:"left"},
+		{header:'${text("状态")}', name:'state', index:'a.state', width:150, align:"center", formatter: function(val, obj, row, act){
+			return val == '0' ? '已入库' : (val == '1' ? '已出库' : '');
+		}},
+		{header:'${text("备注")}', name:'remark', index:'a.remark', 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:mesProductProgress:edit')){ %>
+				actions.push('<a href="${ctx}/mes/mesProductProgress/form?id='+row.id+'" class="btnList" title="${text("编辑半成品仓库表")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/mes/mesProductProgress/delete?id='+row.id+'" class="btnList" title="${text("删除半成品仓库表")}" data-confirm="${text("确认要删除该半成品仓库表吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>