diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index b698d984..e926a6c1 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -23,23 +23,20 @@ public class ProOrderWorkorder extends TreeEntity { private String workorderId; /** 工单编码 */ - @Excel(name = "工单编码") + @Excel(name = "子工单编码") private String workorderCode; /** 工单名称 */ - @Excel(name = "工单名称") private String workorderName; /** 订单id */ - @Excel(name = "订单id") private String orderId; /** 订单编码 */ - @Excel(name = "订单编码") + @Excel(name = "子订单编码") private String orderCode; /** 产品ID */ - @Excel(name = "产品ID") private String productId; /** 产品编号 */ @@ -51,7 +48,6 @@ public class ProOrderWorkorder extends TreeEntity { private String productName; /** 规格型号 */ - @Excel(name = "规格型号") private String productSpc; /** 单位 */ @@ -71,7 +67,7 @@ public class ProOrderWorkorder extends TreeEntity { private String routeCode; /** 产线编码 */ - @Excel(name = "产线编码") + @Excel(name = "产线") private String prodLineCode; /** 工单生产日期 */ @@ -89,31 +85,25 @@ public class ProOrderWorkorder extends TreeEntity { private String shiftId; /** 父工单 */ - @Excel(name = "父工单") private String parentOrder; /** 所有父节点ID */ - @Excel(name = "所有父节点ID") private String ancestors; /** 单据状态 */ - @Excel(name = "单据状态") + @Excel(name = "工单状态") private String status; /** 预留字段1 */ - @Excel(name = "预留字段1") private String attr1; /** 预留字段2 */ - @Excel(name = "预留字段2") private String attr2; /** 预留字段3 */ - @Excel(name = "预留字段3") private String attr3; /** 预留字段4 */ - @Excel(name = "预留字段4") private String attr4; /** 产品类型 */ @@ -121,10 +111,10 @@ public class ProOrderWorkorder extends TreeEntity { private String prodType; /** 是否为底层节点 1是 0不是 */ - @Excel(name = "是否为底层节点") private Integer isEnd; /** 班次名称(数据库无该字段,需自行查询) */ + @Excel(name = "班次") private String shiftDesc; // 料罐id(湿料计划模块使用) @@ -232,7 +222,6 @@ public class ProOrderWorkorder extends TreeEntity { } /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String factoryCode; public void setWorkorderId(String workorderId) {