产品生产记录列表新增工位名称字段

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

@@ -84,6 +84,7 @@ public class MesProductRecord extends DataEntity<MesProductRecord> {
 	private String oprnoTitle;
 	private String source;;//修改来源
 	private String oprno2;
+	private String oprnoName; // 工位名称
 	private List imgList = ListUtils.newArrayList();
 	private List fileList = ListUtils.newArrayList();
 
@@ -91,6 +92,7 @@ public class MesProductRecord extends DataEntity<MesProductRecord> {
 	@ExcelFields({
 			@ExcelField(title="工件码", attrName="sn", align= ExcelField.Align.CENTER, sort=10),
 			@ExcelField(title="工位号", attrName="oprno", align= ExcelField.Align.CENTER, sort=20),
+			@ExcelField(title="工位名称", attrName="oprnoName", align= ExcelField.Align.CENTER, sort=25),
 			@ExcelField(title="工艺号", attrName="craft", align= ExcelField.Align.CENTER, sort=30),
 			@ExcelField(title="报文名称", attrName="title", align= ExcelField.Align.CENTER, sort=40),
 			@ExcelField(title="结果", attrName="content", align= ExcelField.Align.CENTER, sort=50),
@@ -354,4 +356,12 @@ public class MesProductRecord extends DataEntity<MesProductRecord> {
 	public void setFileList(List fileList) {
 		this.fileList = fileList;
 	}
+
+	public String getOprnoName() {
+		return oprnoName;
+	}
+
+	public void setOprnoName(String oprnoName) {
+		this.oprnoName = oprnoName;
+	}
 }

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

@@ -363,6 +363,22 @@ public class MesProductRecordController extends BaseController {
 				page.getList().get(i).setMessageType(mt.getCate());
 				page.getList().get(i).setTitle(mt.getTitle());
 			}
+			// 根据工位号和产线编号查询工位名称
+			MesProductRecord record = page.getList().get(i);
+			if(!StringUtils.isEmpty(record.getOprno()) && !StringUtils.isEmpty(record.getLineSn())){
+				// 先用原始工位号查询，查不到再尝试补A查询
+				MesLineProcess lpQuery = new MesLineProcess();
+				lpQuery.setOprno(record.getOprno());
+				lpQuery.setLineSn(record.getLineSn());
+				MesLineProcess mesLineProcess = mesLineProcessService.findInfo(lpQuery);
+				if(ObjectUtils.isEmpty(mesLineProcess) && record.getOprno().length() == 5){
+					lpQuery.setOprno(record.getOprno() + "A");
+					mesLineProcess = mesLineProcessService.findInfo(lpQuery);
+				}
+				if(!ObjectUtils.isEmpty(mesLineProcess)){
+					record.setOprnoName(mesLineProcess.getTitle());
+				}
+			}
 		}
 		return page;
 	}

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

@@ -116,6 +116,7 @@ $('#dataGrid').dataGrid({
 			return '<a href="${ctx}/mes/mesProductRecord/info?id='+row.id+'" class="btnList" data-title="${text("查看生产记录")}">'+(val||row.id)+'</a>';
 		}},
 		{header:'${text("工位号")}', name:'oprno', index:'a.oprno', width:90, align:"center"},
+		{header:'${text("工位名称")}', name:'oprnoName', index:'oprnoName', width:120, align:"center",sortable:false},
 		{header:'${text("工艺号")}', name:'craft', index:'a.craft', width:90, align:"center"},
 		{header:'${text("报文名称")}', name:'title', index:'b.title', width:180, align:"center",sortable:false},
 		{header:'${text("结果")}', name:'content', index:'a.content', width:80, align:"center"},