diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java
index 374fd508..de000de1 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java
@@ -168,6 +168,17 @@ public class MesPrepare extends BaseEntity {
@Excel(name = "预留字段4")
private String attr4;
+ //生产组线
+ private String workorderNameEqu;
+
+ public String getWorkorderNameEqu() {
+ return workorderNameEqu;
+ }
+
+ public void setWorkorderNameEqu(String workorderNameEqu) {
+ this.workorderNameEqu = workorderNameEqu;
+ }
+
/**
* 工厂编码
*/
@@ -469,6 +480,7 @@ public class MesPrepare extends BaseEntity {
.append("materialSpc", getMaterialSpc())
.append("quantity", getQuantity())
.append("unit", getUnit())
+ .append("workorderNameEqu",getWorkorderNameEqu())
.toString();
}
}
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml
index b9f0a647..d75777a5 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareMapper.xml
@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -55,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ow.product_name productName,
ow.product_date productDate,
ow.quantity_split quantity,
- ow.unit
+ ow.unit,
+ ow.workorder_name workorderNameEqu
from mes_prepare ms
left join pro_order_workorder ow on ms.workorder_code = ow.workorder_code