diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BaseBomDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BaseBomDTO.java
index 2f4ea9c69..2118cb486 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BaseBomDTO.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BaseBomDTO.java
@@ -103,6 +103,15 @@ public class BaseBomDTO extends BaseEntity {
private String productGroupName;
private String productCode;
private String workorderCode;
+ private String parentOrder;
+
+ public String getParentOrder() {
+ return parentOrder;
+ }
+
+ public void setParentOrder(String parentOrder) {
+ this.parentOrder = parentOrder;
+ }
public String getWorkorderCode() {
return workorderCode;
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
index f5c05a81f..77d9b0a24 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
@@ -87,10 +87,10 @@
and bp.product_group_name like concat('%',#{productGroupName}, '%')
-
+
and bp.product_code not in(
select material_code from mes_report_work_consume
- where workorder_code = #{workorderCode} or parent_order = #{workorderCode} and del_flag='0'
+ where workorder_code = #{parentOrder} or parent_order = #{parentOrder} and del_flag='0'
)