Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java

@@ -4,6 +4,8 @@ import com.google.common.base.Objects;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 销售订单对象 sys_sales_order
  * 
@@ -89,6 +91,13 @@ public class SysSalesOrderChild extends BaseEntity {
     @Excel(name = "物料的对外售价")
     private Double materialSole;
 
+    @Excel(name = "物料的最新报价(RMB)")
+    private BigDecimal recentQuotationRMB;
+
+    @Excel(name = "物料的最新报价(RMB)")
+    private BigDecimal recentQuotationUSD;
+
+
     /** 物料的不含税单价(RMB)  */
     @Excel(name = "物料的不含税单价(RMB) ")
     private Double materialRmb;
@@ -498,6 +507,22 @@ public class SysSalesOrderChild extends BaseEntity {
         this.hasCheckNum = hasCheckNum;
     }
 
+    public BigDecimal getRecentQuotationRMB() {
+        return recentQuotationRMB;
+    }
+
+    public void setRecentQuotationRMB(BigDecimal recentQuotationRMB) {
+        this.recentQuotationRMB = recentQuotationRMB;
+    }
+
+    public BigDecimal getRecentQuotationUSD() {
+        return recentQuotationUSD;
+    }
+
+    public void setRecentQuotationUSD(BigDecimal recentQuotationUSD) {
+        this.recentQuotationUSD = recentQuotationUSD;
+    }
+
     @Override
     public String toString() {
         return Objects.toStringHelper(this)
@@ -522,6 +547,8 @@ public class SysSalesOrderChild extends BaseEntity {
                 .add("materialSum", materialSum)
                 .add("enterpriseSum", enterpriseSum)
                 .add("materialSole", materialSole)
+                .add("recentQuotationUSD", recentQuotationUSD)
+                .add("recentQuotationRMB", recentQuotationRMB)
                 .add("materialRmb", materialRmb)
                 .add("materialNoRmb", materialNoRmb)
                 .add("materialNoUsd", materialNoUsd)

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml

@@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="usdTax"               column="usdTax"                 />
         <result property="materialNum"          column="materialNum"            />
         <result property="materialSole"         column="materialSole"           />
+        <result property="recentQuotationRMB"   column="recentQuotation_rmb"    />
+        <result property="recentQuotationUSD"   column="recentQuotation_usd"    />
         <result property="materialRmb"          column="materialRmb"            />
         <result property="materialNoRmb"        column="materialNoRmb"          />
         <result property="materialNoUsd"        column="materialNoUsd"          />
@@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectSysSalesOrderChild">
         select a.id, a.quoteId, a.materialId, a.materialCode, a.materialName, a.materialType, a.processMethod, a.brand, a.photoUrl,a.unit, a.`describe`,
-            a.warehouseDept,a.countTax, a.usdTax, a.materialNum,a.materialSole, a.materialRmb, a.materialNoRmb, a.materialNoUsd, a.materialUsd, a.materialUsdSum,
+            a.warehouseDept,a.countTax, a.usdTax, a.materialNum,a.materialSole,  a.recentQuotation_rmb, a.recentQuotation_usd, a.materialRmb, a.materialNoRmb, a.materialNoUsd, a.materialUsd, a.materialUsdSum,
             a.materialNoUsdSum, a.materialNoRmbSum, a.materialRmbSum,a.delivery_time, a.expiry_day,
             a.out_bound_quantity, a.un_bound_quantity, a.create_by, a.create_time, a.update_by,
             a.update_time, a.remark
@@ -72,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectSysSalesOrderChildListAll" parameterType="SysSalesOrderChild" resultMap="SysSalesOrderChildResult">
        select  id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl,unit, `describe`,
-            warehouseDept,countTax, usdTax, materialNum,materialSole, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum,
+            warehouseDept,countTax, usdTax, materialNum,materialSole , recentQuotation_rmb, recentQuotation_usd, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum,
             materialNoUsdSum, materialNoRmbSum, materialRmbSum,delivery_time, expiry_day,
             out_bound_quantity, un_bound_quantity, create_by, create_time, update_by,
             update_time, remark, use_status,audit_status
@@ -143,6 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usdTax != null">usdTax,</if>
             <if test="materialNum != null">materialNum,</if>
             <if test="materialSole != null">materialSole,</if>
+            <if test="recentQuotationRMB != null">recentQuotation_rmb,</if>
+            <if test="recentQuotationUSD != null">recentQuotation_usd,</if>
             <if test="materialRmb != null">materialRmb,</if>
             <if test="materialNoRmb != null">materialNoRmb,</if>
             <if test="materialNoUsd != null">materialNoUsd,</if>
@@ -183,6 +187,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usdTax != null">#{usdTax},</if>
             <if test="materialNum != null">#{materialNum},</if>
             <if test="materialSole != null">#{materialSole},</if>
+            <if test="recentQuotationRMB != null">#{recentQuotationRMB},</if>
+            <if test="recentQuotationUSD != null">#{recentQuotationUSD},</if>
             <if test="materialRmb != null">#{materialRmb},</if>
             <if test="materialNoRmb != null">#{materialNoRmb},</if>
             <if test="materialNoUsd != null">#{materialNoUsd},</if>
@@ -227,6 +233,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usdTax != null">usdTax = #{usdTax},</if>
             <if test="materialNum != null">materialNum = #{materialNum},</if>
             <if test="materialSole != null">materialSole = #{materialSole},</if>
+            <if test="recentQuotationRMB != null">recentQuotation_rmb = #{recentQuotationRMB},</if>
+            <if test="recentQuotationUSD != null">recentQuotation_usd = #{recentQuotationUSD},</if>
             <if test="materialRmb != null">materialRmb = #{materialRmb},</if>
             <if test="materialNoRmb != null">materialNoRmb = #{materialNoRmb},</if>
             <if test="materialNoUsd != null">materialNoUsd = #{materialNoUsd},</if>
@@ -272,6 +280,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usdTax != null">usdTax = #{usdTax},</if>
             <if test="materialNum != null">materialNum = #{materialNum},</if>
             <if test="materialSole != null">materialSole = #{materialSole},</if>
+            <if test="recentQuotationRMB != null">recentQuotation_rmb = #{recentQuotationRMB},</if>
+            <if test="recentQuotationUSD != null">recentQuotation_usd = #{recentQuotationUSD},</if>
             <if test="materialRmb != null">materialRmb = #{materialRmb},</if>
             <if test="materialNoRmb != null">materialNoRmb = #{materialNoRmb},</if>
             <if test="materialNoUsd != null">materialNoUsd = #{materialNoUsd},</if>

ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@@ -357,6 +357,16 @@
                 },
                 {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
                 { title: '对外售价',field: 'materialSole',align: 'center',},
+                { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
+                { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
+                { title: '最新报价历史',align: 'center',
+
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
+                        return actions.join('');
+                    }
+                },
                 {title: '国内税率',field: 'countTax',align: 'center',editable: {type: 'text',mode: 'inline',},},
                 { title: '美元汇率',field: 'usdTax', align: 'center',editable: {type: 'text',mode: 'inline', }},
                 {title: '物料的数量',field: 'materialNum',align: 'center',
@@ -1060,6 +1070,20 @@
             }
         }
     }
+
+
+
+    //最新报价历史
+    function recentQuotationHistory(materialCode){
+        var customerCode = $("#enterpriseCode").val();
+        var queryParams = new URLSearchParams();
+        queryParams.append("materialCode", materialCode);
+        queryParams.append("customerCode", encodeURIComponent(customerCode));
+        var url = ctx +'system/customerQuote/recentQuotationHistory?'+queryParams.toString();
+
+        $.modal.open("最新报价历史", url);
+    }
+
 </script>
 </body>
 </html>