导出

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 projectNo; // 项目号（根据工件码前缀自动填充）
 
 	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="projectNo", align= ExcelField.Align.CENTER, sort=15),
 			@ExcelField(title="工位号", attrName="oprno", align= ExcelField.Align.CENTER, sort=20),
 			@ExcelField(title="工艺号", attrName="craft", align= ExcelField.Align.CENTER, sort=30),
 			@ExcelField(title="报文名称", attrName="title", align= ExcelField.Align.CENTER, sort=40),
@@ -355,4 +357,25 @@ public class MesProductRecord extends DataEntity<MesProductRecord> {
 	public void setFileList(List fileList) {
 		this.fileList = fileList;
 	}
+
+	public String getProjectNo() {
+		return projectNo;
+	}
+
+	public void setProjectNo(String projectNo) {
+		this.projectNo = projectNo;
+	}
+
+	/**
+	 * 根据工件码前缀自动填充项目号
+	 */
+	public void fillProjectNo() {
+		if (sn == null) return;
+		if (sn.startsWith("+KB23")) { projectNo = "AY7-520"; }
+		else if (sn.startsWith("+KB24")) { projectNo = "AY7-610"; }
+		else if (sn.startsWith("+KA93")) { projectNo = "S500"; }
+		else if (sn.startsWith("+KA99")) { projectNo = "P02-1"; }
+		else if (sn.startsWith("+KA64")) { projectNo = "650"; }
+		else { projectNo = ""; }
+	}
 }

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

@@ -396,7 +396,7 @@ public class MesProductRecordController extends BaseController {
 //			mesProductRecord.setPid("0");
 //		}
 		mesProductRecord.setPage(page1);
-		mesProductRecord.getSqlMap().getOrder().setOrderBy("a.id DESC");
+		mesProductRecord.getSqlMap().getOrder().setOrderBy("a.update_date DESC");
 
 		// 如果查询状态的值为 1, 表示用户选择查询 已加工
 		if("1".equals(mesProductRecord.getProcessState()) && "".equals(mesProductRecord.getContent()))
@@ -547,7 +547,7 @@ public class MesProductRecordController extends BaseController {
 //			mesProductRecord.getSqlMap().getWhere().and("a.sn", QueryType.LIKE, sn);
 //			mesProductRecord.setSn("");
 		}
-		mesProductRecord.getSqlMap().getOrder().setOrderBy("a.id DESC");
+		mesProductRecord.getSqlMap().getOrder().setOrderBy("a.update_date DESC");
 		// 如果查询状态的值为 1, 表示用户选择查询 已加工
 		if("1".equals(mesProductRecord.getProcessState()) && "".equals(mesProductRecord.getContent()))
 		mesProductRecord.getSqlMap().getWhere().and("content",QueryType.NE, "UDF");
@@ -556,6 +556,10 @@ public class MesProductRecordController extends BaseController {
 			mesProductRecord.getSqlMap().getWhere().and("content",QueryType.EQ, "UDF");
 
 		List<MesProductRecord> list = mesProductRecordService.findList(mesProductRecord);
+		// 根据工件码前缀自动填充项目号
+		for (MesProductRecord record : list) {
+			record.fillProjectNo();
+		}
 		String fileName = "产品生产记录" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
 		try(ExcelExport ee = new ExcelExport("产品生产记录", MesProductRecord.class)){
 			ee.setDataList(list).write(response, fileName);