From 38404e5262d98a001493db62de6602b2ed0d5608 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Fri, 24 May 2024 16:41:38 +0800
Subject: [PATCH] '123'

---
 .../src/main/java/com/ruoyi/quot/domain/QuotMaterial.java    | 5 +++++
 ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml   | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java
index 6c7ea94..20e62b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotMaterial.java
@@ -62,6 +62,8 @@ public class QuotMaterial extends BaseEntity
     /** 料价价差率 */
     private String matMatpriceDiff;
 
+    /** 排序 */
+    private Integer index;//序号
 
     /**   */
     private String quotId;
@@ -141,6 +143,9 @@ public class QuotMaterial extends BaseEntity
     public String getMatMatpriceDiff() { return matMatpriceDiff; }
 
     public void setMatMatpriceDiff(String matMatpriceDiff) { this.matMatpriceDiff = matMatpriceDiff; }
+    public Integer getIndex() { return index; }
+
+    public void setIndex(Integer index) { this.index = index; }
     public void setQuotId(String quotId)
     {
         this.quotId = quotId;
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
index 794423e..c2d7402 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
@@ -152,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join quot_material b on b.quot_id = a.quot_id
         <include refid="quotJoins"/>
         where a.quot_id = #{quotId}
+        order by b.number
     </select>
 
     <select id="checkExistQuot" parameterType="String" resultType="String">
@@ -314,9 +315,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchQuotMaterial">
-        insert into quot_material( mat_id, mat_xingh, mat_guig, mat_diany,mat_standard, mat_danw, mat_sl,mat_remark, quot_id) values
+        insert into quot_material( mat_id, mat_xingh, mat_guig, mat_diany,mat_standard, mat_danw, mat_sl,mat_remark, quot_id,number) values
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.matId}, #{item.matXingh}, #{item.matGuig}, #{item.matDiany}, #{item.matStandard}, #{item.matDanw}, cast(#{item.matSl,jdbcType=DECIMAL} as decimal(18,3)),#{item.matRemark}, #{item.quotId})
+            ( #{item.matId}, #{item.matXingh}, #{item.matGuig}, #{item.matDiany}, #{item.matStandard}, #{item.matDanw}, cast(#{item.matSl,jdbcType=DECIMAL} as decimal(18,3)),#{item.matRemark}, #{item.quotId}, #{item.index})
         </foreach>
     </insert>