change - add销售订单添加物料规格型号

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;
     }

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,