维修

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

@@ -5,6 +5,9 @@ import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import com.jeesite.common.utils.excel.annotation.ExcelField;
+import com.jeesite.common.utils.excel.annotation.ExcelField.Align;
+import com.jeesite.common.utils.excel.annotation.ExcelFields;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -32,13 +35,6 @@ import javax.validation.constraints.Size;
 		@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 = JoinTable.Type.LEFT_JOIN, entity = MesLineProcess.class, attrName = "this",
-			alias = "b", on = "b.oprno = a.oprno",
-			columns = {
-				@Column(name = "title", attrName = "oprnoName", label = "工位名称")
-			})
-	},
 	orderBy="a.update_date DESC"
 )
 public class MesRepairItems extends DataEntity<MesRepairItems> {
@@ -97,6 +93,18 @@ public class MesRepairItems extends DataEntity<MesRepairItems> {
 	public void setLineSn(String lineSn) {
 		this.lineSn = lineSn;
 	}
+	@ExcelFields({
+		@ExcelField(title="工位号", attrName="oprno", align=Align.CENTER, sort=10),
+		@ExcelField(title="产线编号", attrName="lineSn", align=Align.CENTER, sort=20),
+		@ExcelField(title="标题", attrName="title", align=Align.CENTER, sort=30),
+		@ExcelField(title="修复描述", attrName="content", align=Align.CENTER, sort=40),
+		@ExcelField(title="返工动作介绍", attrName="introduction", align=Align.CENTER, sort=50),
+		@ExcelField(title="检查要点", attrName="inspectionPoints", align=Align.CENTER, sort=60),
+		@ExcelField(title="回归工位", attrName="returnOprno", align=Align.CENTER, sort=70),
+		@ExcelField(title="返工类型", attrName="type", align=Align.CENTER, sort=80, dictType="mes_repair_type"),
+		@ExcelField(title="是否重做总成气密", attrName="isCp", align=Align.CENTER, sort=90, dictType="mes_repair_item_qm"),
+		@ExcelField(title="是否重做液冷气密", attrName="isYl", align=Align.CENTER, sort=100, dictType="mes_repair_item_qm"),
+	})
 	public MesRepairItems() {
 		this(null);
 	}

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

@@ -1,15 +1,18 @@
 <?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.MesRepairItemsDao">
-	
-	<!-- 查询数据
+
+	<!-- 查询数据：用子查询取工位名称，避免与 mes_line_process 一对多 join 导致行数翻倍 -->
 	<select id="findList" resultType="MesRepairItems">
-		SELECT ${sqlMap.column.toSql()}
+		SELECT ${sqlMap.column.toSql()},
+			(SELECT b.title FROM mes_line_process b
+				WHERE b.oprno = a.oprno AND b.status = '0'
+				ORDER BY b.update_date DESC LIMIT 1) AS "oprnoName"
 		FROM ${sqlMap.table.toSql()}
 		<where>
 			${sqlMap.where.toSql()}
 		</where>
 		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
-	
+	</select>
+
 </mapper>