123

ABAP_AS_WITH_POOL.jcoDestination

@@ -1,11 +0,0 @@
-#for tests only !
-#Mon Jul 08 09:58:00 CST 2024
-jco.destination.pool_capacity=10
-jco.client.lang=ZH
-jco.client.ashost=172.19.0.125
-jco.client.saprouter=
-jco.client.user=RFC
-jco.client.sysnr=00
-jco.destination.peak_limit=10
-jco.client.passwd=654321
-jco.client.client=800

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java

@@ -255,6 +255,7 @@ public class QuotController extends BaseController
         }
 
         //quot.setQuotSalesmanCode(getUsername());
+        quot.setQuotDistinguish("2");//报价单区分 - 2：创建询价单-传附件
         quot.setUpdateBy(getUsername());
         quotService.insertQuot(quot);
         return success(quot);
@@ -457,6 +458,7 @@ public class QuotController extends BaseController
                     quot.setCreateBy(getUsername());
                 }
                 //quot.setQuotSalesmanCode(getUsername());
+                quot.setQuotDistinguish("2");//报价单区分 - 2：创建询价单-传附件
                 quotService.insertQuot(quot);
                 //sendNoticeToBjz(quot);
                 return success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java

@@ -282,6 +282,7 @@ public class RedBookController extends BaseController
             xjquot.setQuotSalesmanDeptId(getLoginUser().getUser().getDept().getDeptId()+"");//部门id
             xjquot.setQuotSalesmanDeptName(getLoginUser().getUser().getDept().getDeptName());//部门名称
             xjquot.setQuotRbDateUid(quot.getRbDateUid());//调价日期
+            xjquot.setQuotDistinguish("1");//报价单区分 - 1：报价生成询价单-传明细
             xjquot.setCreateBy(getUsername());
 
             List<OAQuotProduct> list = quot.getSelectedResultData();

ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java

@@ -131,6 +131,9 @@ public class Quot extends BaseEntity
     /** 营销经理下载反馈附件情况 */
     private String quotHandle;
 
+    /** 报价单区分（1：报价生成询价单-传明细 2：创建询价单-传附件） */
+    private String quotDistinguish;
+
 
 
     /** 技术协助 */
@@ -388,6 +391,11 @@ public class Quot extends BaseEntity
     public String getQuotHandle() { return quotHandle; }
 
     public void setQuotHandle(String quotHandle) { this.quotHandle = quotHandle; }
+
+    public String getQuotDistinguish() {return quotDistinguish;}
+
+    public void setQuotDistinguish(String quotDistinguish) {this.quotDistinguish = quotDistinguish;}
+
     public List<QuotMaterial> getQuotMaterialList() { return quotMaterialList; }
 
     public void setQuotMaterialList(List<QuotMaterial> quotMaterialList)

ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="quotHandle"    column="quot_handle"    />
+        <result property="quotDistinguish"    column="quot_distinguish"    />
 
         <result property="quotJsxzStandard"    column="quot_jsxz_standard"    />
         <result property="quotJsxzApprovalStatus"    column="quot_jsxz_approval_status"    />
@@ -121,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price,
                a.quot_check_user_name, u2.nick_name quot_check_user_nickname,a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname, a.quot_approval_status,a.quot_materials_count,a.quot_rbDateUid,
                a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
-               a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle,
+               a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle,a.quot_distinguish,
 
                 a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
                 a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
@@ -169,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname,
                a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname,a.quot_approval_status,a.quot_rbDateUid,
                 a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
-               a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle,
+               a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle,a.quot_distinguish,
 
                 a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
                 a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
@@ -254,6 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">quot_matprice_diff2,</if>
             <if test="quotPrint != null and quotPrint != ''">quot_print,</if>
             <if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name,</if>
+            <if test="quotDistinguish != null and quotDistinguish != ''">quot_distinguish,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
@@ -304,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">#{quotMatpriceDiff2},</if>
             <if test="quotPrint != null and quotPrint != ''">#{quotPrint},</if>
             <if test="quotPrintUserName != null and quotPrintUserName != ''">#{quotPrintUserName},</if>
+            <if test="quotDistinguish != null and quotDistinguish != ''">#{quotDistinguish},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>