From 9e680308e3cac0f6ac59d66b798f483eed78913c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com>
Date: Fri, 28 Feb 2025 09:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=8D=A1=E7=89=87=E5=8F=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=89=93=E5=8D=B0=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=84=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/mes/domain/MesPrepare.java  | 12 ++++++++++++
 .../main/resources/mapper/mes/MesPrepareMapper.xml   |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

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 374fd508e..de000de12 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 b9f0a6476..d75777a5e 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"
 		<result property="materialSpc"	column="material_spc"	/>
 		<result property="unit"	column="unit"	/>
 		<result property="quantity"	column="quantity"	/>
+		<result property="workorderNameEqu"	column="workorderNameEqu"	/>
 	</resultMap>
 
 	<sql id="selectMesPrepareVo">
@@ -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
 		<where>