Forráskód Böngészése

x13-修复返修记录导出没有返修报名单的问题

张田野 2 hete
szülő
commit
558fcf9f5c

+ 3 - 1
src/main/java/com/jeesite/modules/mes/entity/MesRepair.java

@@ -81,8 +81,10 @@ public class MesRepair extends DataEntity<MesRepair> {
 			@ExcelField(title="工件码", attrName="sn", align= ExcelField.Align.CENTER, sort=10),
 //			@ExcelField(title="返修工位", attrName="fxOprno", align= ExcelField.Align.CENTER, sort=15),
 			@ExcelField(title="责任工位", attrName="oprno", align= ExcelField.Align.CENTER, sort=20),
+			@ExcelField(title="返工白名单", attrName="itemTitle", align= ExcelField.Align.CENTER, sort=25),
+			@ExcelField(title="返工类型", attrName="type", dictType="mes_repair_type", align= ExcelField.Align.CENTER, sort=30),
 			@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="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"),