From 3201fc46d5a75e839f92c080cd959ee98007150a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 3 Aug 2024 16:43:01 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20add=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hw/mes/domain/MesSaleOrder.java   | 13 +++++++++++++
 .../resources/mapper/mes/MesSaleOrderMapper.xml     |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java
index e66a62d..54c8c7b 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java
@@ -161,6 +161,19 @@ public class MesSaleOrder extends BaseEntity {
     @Excel(name = "是否标识：1-是；0-否")
     private String isFlag;
 
+    /**
+     * 规格型号
+     */
+    private String materialModel;
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel;
+    }
+
     public void setSaleOrderId(Long saleOrderId) {
         this.saleOrderId = saleOrderId;
     }
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml
index 3cbb933..e9ca8cc 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml
@@ -33,6 +33,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="materialModel" column="material_model"/>
     </resultMap>
 
     <sql id="selectMesSaleOrderVo">
@@ -47,6 +48,7 @@
                material_id,
                material_code,
                material_name,
+               material_model,
                matkl,
                order_amount,
                complete_amount,