报工组件修改11

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;

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml

@@ -87,10 +87,10 @@
         <if test="productGroupName != null  and productGroupName != ''">
             and bp.product_group_name like concat('%',#{productGroupName}, '%')
         </if>
-        <if test="workorderCode != null  and workorderCode != ''">
+        <if test="parentOrder != null  and parentOrder != ''">
         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'
         )
         </if>
     </select>