返修改为返工

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

@@ -5,7 +5,7 @@ import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.mes.entity.MesRepairItems;
 
 /**
- * 返修问题清单DAO接口
+ * 返工问题清单DAO接口
  * @author hzd
  * @version 2023-10-11
  */

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

@@ -21,19 +21,19 @@ import java.util.List;
 @Table(name="mes_repair", alias="a", label="返工记录表信息", columns={
 		@Column(name="id", attrName="id", label="id", isPK=true),
 		@Column(name="sn", attrName="sn", label="工件号"),
-		@Column(name="fx_oprno", attrName="fxOprno", label="返修工位"),
+		@Column(name="fx_oprno", attrName="fxOprno", label="返工工位"),
 		@Column(name="oprno", attrName="oprno", label="责任工位"),
 		@Column(name="return_oprno", attrName="returnOprno", label="返回工位"),
 		@Column(name="sops", attrName="sops", label="选择的修复方案", isQuery=false),
 		@Column(name="state", attrName="state", label="状态"),
 		@Column(name="remark", attrName="remark", label="备注"),
 		@Column(name="result", attrName="result", label="结果"),
-		@Column(name="fx_by", attrName="fxBy", label="返修人"),
+		@Column(name="fx_by", attrName="fxBy", label="返工人"),
 		@Column(name="ngid", attrName="ngid", label="ng记录id"),
 		@Column(name="type", attrName="type", label="返工类型"),
 		@Column(name="item_id", attrName="itemId", label="白名单"),
 		@Column(name="line_sn", attrName="lineSn", label="产线编号"),
-		@Column(name="fx_date", attrName="fxDate", label="返修时间", isUpdateForce=true),
+		@Column(name="fx_date", attrName="fxDate", label="返工时间", isUpdateForce=true),
 		@Column(name="check_by", attrName="checkBy", label="检查人"),
 		@Column(name="check_date", attrName="checkDate", label="检查时间", isUpdateForce=true),
 		@Column(name="create_by", attrName="createBy", label="创建人", isUpdate=false, isQuery=false),
@@ -55,7 +55,7 @@ public class MesRepair extends DataEntity<MesRepair> {
 	
 	private static final long serialVersionUID = 1L;
 	private String sn;		// 工件号
-	private String fxOprno;		// 返修工位
+	private String fxOprno;		// 返工工位
 	private String title;
 	private String oprno;		// 责任工位
 	private String sops;		// 选择的修复方案
@@ -63,8 +63,8 @@ public class MesRepair extends DataEntity<MesRepair> {
 	private String lineSn;
 	private String remark;		// 备注
 	private String result;		// 结果
-	private String fxBy;		// 返修人
-	private Date fxDate;		// 返修时间
+	private String fxBy;		// 返工人
+	private Date fxDate;		// 返工时间
 	private String checkBy;		// 检查人
 	private Date checkDate;		// 检查时间
 	private String ngid;
@@ -79,13 +79,13 @@ public class MesRepair extends DataEntity<MesRepair> {
 
 	@ExcelFields({
 			@ExcelField(title="工件码", attrName="sn", align= ExcelField.Align.CENTER, sort=10),
-//			@ExcelField(title="返修工位", attrName="fxOprno", align= ExcelField.Align.CENTER, sort=15),
+//			@ExcelField(title="返工工位", attrName="fxOprno", align= ExcelField.Align.CENTER, sort=15),
 			@ExcelField(title="责任工位", attrName="oprno", align= ExcelField.Align.CENTER, sort=20),
 			@ExcelField(title="状态", attrName="state",dictType="mes_repair_state", align= ExcelField.Align.CENTER, sort=40),
 			@ExcelField(title="备注", attrName="remark", align= ExcelField.Align.CENTER, sort=50),
 			@ExcelField(title="结果", attrName="result",dictType="mes_repair_result", align= ExcelField.Align.CENTER, sort=55),
-			@ExcelField(title="返修人", attrName="fxBy", align= ExcelField.Align.CENTER, sort=60),
-			@ExcelField(title="返修时间", attrName="fxDate", align= ExcelField.Align.CENTER, sort=65, dataFormat="yyyy-MM-dd hh:mm:ss"),
+			@ExcelField(title="返工人", attrName="fxBy", align= ExcelField.Align.CENTER, sort=60),
+			@ExcelField(title="返工时间", attrName="fxDate", align= ExcelField.Align.CENTER, sort=65, dataFormat="yyyy-MM-dd hh:mm:ss"),
 			@ExcelField(title="检查人", attrName="checkBy", align= ExcelField.Align.CENTER, sort=70),
 			@ExcelField(title="检查时间", attrName="checkDate", align= ExcelField.Align.CENTER, sort=75, dataFormat="yyyy-MM-dd hh:mm:ss"),
 			@ExcelField(title="产线编号", attrName="lineSn", align= ExcelField.Align.CENTER, sort=80),
@@ -122,7 +122,7 @@ public class MesRepair extends DataEntity<MesRepair> {
 		this.sn = sn;
 	}
 	
-	@Size(min=0, max=20, message="返修工位长度不能超过 20 个字符")
+	@Size(min=0, max=20, message="返工工位长度不能超过 20 个字符")
 	public String getFxOprno() {
 		return fxOprno;
 	}
@@ -176,7 +176,7 @@ public class MesRepair extends DataEntity<MesRepair> {
 		this.result = result;
 	}
 	
-	@Size(min=0, max=64, message="返修人长度不能超过 64 个字符")
+	@Size(min=0, max=64, message="返工人长度不能超过 64 个字符")
 	public String getFxBy() {
 		return fxBy;
 	}

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

@@ -13,11 +13,11 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
 /**
- * 返修问题清单Entity
+ * 返工问题清单Entity
  * @author hzd
  * @version 2023-10-11
  */
-@Table(name="mes_repair_items", alias="a", label="返修问题清单信息", columns={
+@Table(name="mes_repair_items", alias="a", label="返工问题清单信息", columns={
 		@Column(name="id", attrName="id", label="id", isPK=true),
 		@Column(name="oprno", attrName="oprno", label="工位号"),
 		@Column(name="line_sn", attrName="lineSn", label="产线编号"),

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

@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 /**
- * 返修问题清单Service
+ * 返工问题清单Service
  * @author hzd
  * @version 2023-10-11
  */

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

@@ -171,8 +171,8 @@ public class MesRepairController extends BaseController {
 	@RequestMapping(value = "exportData")
 	public void exportData(MesRepair mesRepair, HttpServletResponse response) {
 		List<MesRepair> list = mesRepairService.findList(mesRepair);
-		String fileName = "返修记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
-		try(ExcelExport ee = new ExcelExport("返修记录", MesRepair.class)){
+		String fileName = "返工记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+		try(ExcelExport ee = new ExcelExport("返工记录", MesRepair.class)){
 			ee.setDataList(list).write(response, fileName);
 		}
 	}
@@ -225,7 +225,7 @@ public class MesRepairController extends BaseController {
 		}
 		MesProduct pd = list.get(0);
 		if(!pd.getState().equals("0") && !pd.getState().equals("2")){
-			resp1.setMessage("当前工件不能返修");
+			resp1.setMessage("当前工件不能返工");
 			return resp1;
 		}
 		mesRepair.setSn(sn);
@@ -241,14 +241,14 @@ public class MesRepairController extends BaseController {
 		}
 		MesProductRecord ngInfo = mesProductRecordService.findInfo(mesProductRecord);
 		if(ObjectUtils.isEmpty(ngInfo)){
-			resp1.setMessage("当前工件不需要返修");
+			resp1.setMessage("当前工件不需要返工");
 			return resp1;
 		}
 
 //		mesRepairOprno.setSn(fxOprno);
 //		MesRepairOprno rno = mesRepairOprnoService.findInfo(mesRepairOprno);
 //		if(ObjectUtils.isEmpty(rno)){
-//			resp1.setMessage("请先设置返修管理工位");
+//			resp1.setMessage("请先设置返工管理工位");
 //			return resp1;
 //		}
 //		String[] rnos = rno.getOprnos().split(",");
@@ -259,7 +259,7 @@ public class MesRepairController extends BaseController {
 //			}
 //		}
 //		if(!qx){
-//			resp1.setMessage("没有返修项");
+//			resp1.setMessage("没有返工项");
 //			return resp1;
 //		}
 //		MesDevice deviceInfo = mesDeviceService.findInfoBySn(ngInfo.getLineSn()+ngInfo.getOprno());
@@ -462,7 +462,7 @@ public class MesRepairController extends BaseController {
 		mesRepairQuality.setRepairId(mesRepair.getId());
 		MesRepairQuality rq = mesRepairQualityService.findById(mesRepairQuality);
 		if (ObjectUtils.isEmpty(rq)) {
-			return renderResult(Global.FALSE, text("返修质量未检查"));
+			return renderResult(Global.FALSE, text("返工质量未检查"));
 		}
 		mesRepairService.save(mesRepair);
 
@@ -479,7 +479,7 @@ public class MesRepairController extends BaseController {
 			pp.setContent("OK");
 			if(mesRepair.getLineSn().equals("XT")){
 				if(mesRepair.getOprno().equals("OP400")){
-					pt.setState("0"); // 框架自OP250后的返修，需要再次做总成气密
+					pt.setState("0"); // 框架自OP250后的返工，需要再次做总成气密
 				}
 
 				ArrayList<String> oprnos = new ArrayList<String>();
@@ -632,7 +632,7 @@ public class MesRepairController extends BaseController {
 			return resp;
 		}
 		if(!pd.getState().equals("0") && !pd.getState().equals("2")){
-			resp.setMessage("当前工件不能返修");
+			resp.setMessage("当前工件不能返工");
 			return resp;
 		}
 
@@ -641,7 +641,7 @@ public class MesRepairController extends BaseController {
 		mesRepair.getSqlMap().getWhere().and("a.state",QueryType.NE,3); // 排除已修复的
 		MesRepair mesRepair1 = mesRepairService.findInfo(mesRepair);
 		if(!ObjectUtils.isEmpty(mesRepair1)){
-			resp.setMessage("该工件返修中");
+			resp.setMessage("该工件返工中");
 			return resp;
 		}
 
@@ -651,7 +651,7 @@ public class MesRepairController extends BaseController {
 		mesProductRecord.setCraft("100000");
 		MesProductRecord ngInfo = mesProductRecordService.findInfo(mesProductRecord);
 		if(ObjectUtils.isEmpty(ngInfo)){
-			resp.setMessage("当前工件不需要返修");
+			resp.setMessage("当前工件不需要返工");
 			return resp;
 		}
 		if(!ngInfo.getContent().equals("NG")){
@@ -667,7 +667,7 @@ public class MesRepairController extends BaseController {
 		mesRepair2.setRemark(remark);
 		mesRepair2.setOprno(oprno);
 		mesRepair2.setType(type);
-		if(type.equals("1")){ // 在线返修
+		if(type.equals("1")){ // 在线返工
 			mesRepair2.setState("2");
 		}else{
 			mesRepair2.setState("1");

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

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 返修问题清单Controller
+ * 返工问题清单Controller
  * @author hzd
  * @version 2023-10-11
  */
@@ -93,7 +93,7 @@ public class MesRepairItemsController extends BaseController {
 	@ResponseBody
 	public String save(@Validated MesRepairItems mesRepairItems) {
 		mesRepairItemsService.save(mesRepairItems);
-		return renderResult(Global.TRUE, text("保存返修问题清单成功！"));
+		return renderResult(Global.TRUE, text("保存返工问题清单成功！"));
 	}
 	
 	/**
@@ -105,7 +105,7 @@ public class MesRepairItemsController extends BaseController {
 	public String disable(MesRepairItems mesRepairItems) {
 		mesRepairItems.setStatus(MesRepairItems.STATUS_DISABLE);
 		mesRepairItemsService.updateStatus(mesRepairItems);
-		return renderResult(Global.TRUE, text("停用返修问题清单成功"));
+		return renderResult(Global.TRUE, text("停用返工问题清单成功"));
 	}
 	
 	/**
@@ -117,7 +117,7 @@ public class MesRepairItemsController extends BaseController {
 	public String enable(MesRepairItems mesRepairItems) {
 		mesRepairItems.setStatus(MesRepairItems.STATUS_NORMAL);
 		mesRepairItemsService.updateStatus(mesRepairItems);
-		return renderResult(Global.TRUE, text("启用返修问题清单成功"));
+		return renderResult(Global.TRUE, text("启用返工问题清单成功"));
 	}
 	
 	/**
@@ -128,7 +128,7 @@ public class MesRepairItemsController extends BaseController {
 	@ResponseBody
 	public String delete(MesRepairItems mesRepairItems) {
 		mesRepairItemsService.delete(mesRepairItems);
-		return renderResult(Global.TRUE, text("删除返修问题清单成功！"));
+		return renderResult(Global.TRUE, text("删除返工问题清单成功！"));
 	}
 
 	@RequestMapping(value = "all")

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

@@ -26,7 +26,7 @@
 					<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>
+								<span class="required hide">*</span> ${text('返工工位')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:input path="fxOprno" maxlength="20" class="form-control"/>
 							</div>
@@ -80,7 +80,7 @@
 					<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>
+								<span class="required hide">*</span> ${text('返工人')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:input path="fxBy" maxlength="64" class="form-control"/>
 							</div>
@@ -89,7 +89,7 @@
 					<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>
+								<span class="required hide">*</span> ${text('返工时间')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:input path="fxDate" readonly="true" maxlength="20" class="form-control laydate"
 									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>

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

@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa icon-note"></i> ${text('返修记录详情')}
+				<i class="fa icon-note"></i> ${text('返工记录详情')}
 			</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>
@@ -23,7 +23,7 @@
 								<td>${mesRepair.sn}</td>
 							</tr>
 							<tr>
-								<th class="mpc-header">返修工位</th>
+								<th class="mpc-header">返工工位</th>
 								<td>${mesRepair.fxOprno}</td>
 							</tr>
 							<tr>
@@ -51,7 +51,7 @@
 							</tr>
 
 							<tr>
-								<th class="mpc-header">返修结果</th>
+								<th class="mpc-header">返工结果</th>
 								<td>
 									<% if(mesRepair.result=="1"){ %>
 									  OK
@@ -83,11 +83,11 @@
 								<td>${@DateUtils.formatDateTime(mesRepair.createDate) }</td>
 							</tr>
 							<tr>
-								<th class="mpc-header">返修人</th>
+								<th class="mpc-header">返工人</th>
 								<td>${mesRepair.fxBy}</td>
 							</tr>
 							<tr>
-								<th class="mpc-header">返修时间</th>
+								<th class="mpc-header">返工时间</th>
 								<td>${@DateUtils.formatDateTime(mesRepair.fxDate) }</td>
 							</tr>
 							<tr>

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

@@ -1,9 +1,9 @@
-<% layout('/layouts/default.html', {title: '返修问题清单管理', libs: ['validate']}){ %>
+<% 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(mesRepairItems.isNewRecord ? '新增返修问题清单' : '编辑返修问题清单')}
+				<i class="fa icon-note"></i> ${text(mesRepairItems.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>
@@ -35,7 +35,7 @@
 					<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>
+								<span class="required ">*</span> ${text('返工原因')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:input path="title" maxlength="255" class="form-control required"/>
 							</div>

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

@@ -1,9 +1,9 @@
-<% layout('/layouts/default.html', {title: '返修问题清单详情', libs: []}){ %>
+<% layout('/layouts/default.html', {title: '返工问题清单详情', libs: []}){ %>
 <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('返修问题清单详情')}
+				<i class="fa icon-note"></i> ${text('返工问题清单详情')}
 			</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>
@@ -21,7 +21,7 @@
 					<td>${mesRepairItems.lineSn}</td>
 				</tr>
 				<tr>
-					<th class="mpc-header">${text('返修原因')}</th>
+					<th class="mpc-header">${text('返工原因')}</th>
 					<td>${mesRepairItems.title}</td>
 				</tr>
 				<tr>

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

@@ -1,14 +1,14 @@
-<% layout('/layouts/default.html', {title: '返修问题清单管理', libs: ['dataGrid']}){ %>
+<% 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('返修问题清单管理')}
+				<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:mesRepairItems:edit')){ %>
-					<a href="${ctx}/mes/mesRepairItems/form" class="btn btn-default btnTool" title="${text('新增返修问题清单')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+					<a href="${ctx}/mes/mesRepairItems/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>
@@ -29,7 +29,7 @@
 				</div>
 			</div>
 				<div class="form-group">
-					<label class="control-label">${text('返修原因')}：</label>
+					<label class="control-label">${text('返工原因')}：</label>
 					<div class="control-inline">
 						<#form:input path="title" maxlength="255" class="form-control width-120"/>
 					</div>
@@ -64,12 +64,12 @@ $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		// {header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
-		// 	return '<a href="${ctx}/mes/mesRepairItems/form?id='+row.id+'" class="btnList" data-title="${text("编辑返修问题清单")}">'+(val||row.id)+'</a>';
+		// 	return '<a href="${ctx}/mes/mesRepairItems/form?id='+row.id+'" class="btnList" data-title="${text("编辑返工问题清单")}">'+(val||row.id)+'</a>';
 		// }},
 		// {header:'${text("工位名称")}', name:'oprnoName', width:150, align:"center", frozen:true},
 		{header:'${text("产线编号")}', name:'lineSn', index:'a.line_sn', width:150, align:"center", frozen:true},
-		{header:'${text("返修原因")}', name:'title', index:'a.title', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="${ctx}/mes/mesRepairItems/info?id='+row.id+'" class="btnList" data-title="${text("返修问题清单详情")}">'+(val||row.id)+'</a>';
+		{header:'${text("返工原因")}', name:'title', index:'a.title', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/mes/mesRepairItems/info?id='+row.id+'" class="btnList" data-title="${text("返工问题清单详情")}">'+(val||row.id)+'</a>';
 		}},
 		// {header:'${text("修复描述")}', name:'content', index:'a.content', width:150, align:"center"},
 		{header:'${text("返工动作介绍")}', name:'introduction', index:'a.introduction', width:150, align:"center"},
@@ -91,13 +91,13 @@ $('#dataGrid').dataGrid({
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
 			//<% if(hasPermi('mes:mesRepairItems:edit')){ %>
-				actions.push('<a href="${ctx}/mes/mesRepairItems/form?id='+row.id+'" class="btnList" title="${text("编辑返修问题清单")}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/mes/mesRepairItems/form?id='+row.id+'" class="btnList" title="${text("编辑返工问题清单")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
-					actions.push('<a href="${ctx}/mes/mesRepairItems/disable?id='+row.id+'" class="btnList" title="${text("停用返修问题清单")}" data-confirm="${text("确认要停用该返修问题清单吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+					actions.push('<a href="${ctx}/mes/mesRepairItems/disable?id='+row.id+'" class="btnList" title="${text("停用返工问题清单")}" data-confirm="${text("确认要停用该返工问题清单吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				} else if (row.status == Global.STATUS_DISABLE){
-					actions.push('<a href="${ctx}/mes/mesRepairItems/enable?id='+row.id+'" class="btnList" title="${text("启用返修问题清单")}" data-confirm="${text("确认要启用该返修问题清单吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+					actions.push('<a href="${ctx}/mes/mesRepairItems/enable?id='+row.id+'" class="btnList" title="${text("启用返工问题清单")}" data-confirm="${text("确认要启用该返工问题清单吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
-				actions.push('<a href="${ctx}/mes/mesRepairItems/delete?id='+row.id+'" class="btnList" title="${text("删除返修问题清单")}" data-confirm="${text("确认要删除该返修问题清单吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="${ctx}/mes/mesRepairItems/delete?id='+row.id+'" class="btnList" title="${text("删除返工问题清单")}" data-confirm="${text("确认要删除该返工问题清单吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			//<% } %>
 			return actions.join('');
 		}}

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

@@ -24,7 +24,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('返修工位')}：</label>
+					<label class="control-label">${text('返工工位')}：</label>
 					<div class="control-inline">
 						<#form:input path="fxOprno" maxlength="20" class="form-control width-120"/>
 					</div>
@@ -56,13 +56,13 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('返修人')}：</label>
+					<label class="control-label">${text('返工人')}：</label>
 					<div class="control-inline">
 						<#form:input path="fxBy" maxlength="64" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('返修时间')}：</label>
+					<label class="control-label">${text('返工时间')}：</label>
 					<div class="control-inline">
 						<#form:input path="fxDate" readonly="true" maxlength="20" class="form-control laydate width-datetime"
 							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
@@ -104,7 +104,7 @@ $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'${text("工件码")}', name:'sn', index:'a.sn', width:280, align:"center",frozen:true},
-		// {header:'${text("返修工位")}', name:'fxOprno', index:'a.fx_oprno', width:150, align:"center"},
+		// {header:'${text("返工工位")}', name:'fxOprno', index:'a.fx_oprno', width:150, align:"center"},
 		{header:'${text("责任工位")}', name:'oprno', index:'a.oprno', width:150, align:"center"},
 		{header:'${text("返工白名单")}', name:'itemTitle', index:'b.title', width:150, align:"center"},
 		{header:'${text("返工类型")}', name:'type', index:'a.type', width:150, align:"center", formatter: function(val, obj, row, act){
@@ -119,8 +119,8 @@ $('#dataGrid').dataGrid({
 		{header:'${text("结果")}', name:'result', index:'a.result', width:150, align:"center", formatter: function(val, obj, row, act){
 				return js.getDictLabel(${@DictUtils.getDictListJson('mes_repair_result')}, val, '${text("未知")}', true);
 			}},
-		{header:'${text("返修人")}', name:'fxBy', index:'a.fx_by', width:150, align:"center"},
-		{header:'${text("返修时间")}', name:'fxDate', index:'a.fx_date', width:150, align:"center"},
+		{header:'${text("返工人")}', name:'fxBy', index:'a.fx_by', width:150, align:"center"},
+		{header:'${text("返工时间")}', name:'fxDate', index:'a.fx_date', width:150, align:"center"},
 		{header:'${text("检查人")}', name:'checkBy', index:'a.check_by', width:150, align:"center"},
 		{header:'${text("检查时间")}', name:'checkDate', index:'a.check_date', width:150, align:"center"},
 		{header:'${text("产线编号")}', name:'lineSn', index:'a.line_sn', width:150, align:"center"},