From 270495c0ab26b31ab131ef8e096191f7dbb43dee Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 25 Mar 2024 11:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B911?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/system/api/domain/dto/BaseBomDTO.java    | 9 +++++++++
 .../resources/mapper/mes/MesReportWorkConsumeMapper.xml  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

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 @@
         <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>