'11112222'

ABAP_AS_WITH_POOL.jcoDestination

@@ -1,5 +1,5 @@
 #for tests only !
-#Fri Jul 05 09:06:58 CST 2024
+#Fri Jul 05 10:21:23 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.125
@@ -7,5 +7,5 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
-jco.client.passwd=w*-uy]U3Wh]qqBBh_@He72CAdEX)_WU]ErNsU17||5aw7eD7
+jco.client.passwd=u[=P1QVdS-RPMlLkq1i.Y!2.4N4Yel9cX%.$mi1AeSm065Ii
 jco.client.client=800

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

@@ -269,7 +269,7 @@ public class RedBookController extends BaseController
         Quot xjquot = new Quot();
         List<QuotMaterial> materials = new ArrayList<QuotMaterial>();
         QuotMaterial xjquotMaterials = new QuotMaterial();
-        /*File excelFile = null;*/
+        File excelFile = null;
         try{
             xjquot.setQuotId(UUID.fastUUID().toString());
             String quotCode = redBookService.getCode("BJD");
@@ -285,7 +285,7 @@ public class RedBookController extends BaseController
 
             List<OAQuotProduct> list = quot.getSelectedResultData();
             /** ===================================插入询价单明细表==================================*/
-            for(OAQuotProduct op:list){
+            /*for(OAQuotProduct op:list){
                 xjquotMaterials = new QuotMaterial();
                 xjquotMaterials.setMatXingh(op.getName_1());//型号
                 xjquotMaterials.setMatGuig(op.getSpec());//规格
@@ -301,12 +301,12 @@ public class RedBookController extends BaseController
                 xjquotMaterials.setIndex(op.getIndex());
                 materials.add(xjquotMaterials);
             }
-            xjquot.setQuotMaterialList(materials);
+            xjquot.setQuotMaterialList(materials);*/
             iQuotService.insertQuot(xjquot);
 
             /** ===================================插入询价单明细表==================================*/
             /** ===================================产品明细生成附件==================================*/
-            /**File directory = new File("xjQuotFile/");
+            File directory = new File("xjQuotFile/");
             // 如果文件夹不存在，则创建文件夹
             if (!directory.exists()) {
                 directory.mkdir();
@@ -344,7 +344,7 @@ public class RedBookController extends BaseController
                 return error("系统异常,询价单号为空!");
             }
             // 上传清单附件
-            FileUtils.delete(excelFile);*/
+            FileUtils.delete(excelFile);
             /** ===================================产品明细生成附件==================================*/
         }catch(Exception e){
             return error("系统异常");

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

@@ -161,6 +161,7 @@ public class quotJswController extends BaseController {
             q.setQuotLvPrice(quot.getQuotLvPrice());
             q.setQuotTongPrice(quot.getQuotTongPrice());
             q.setQuotMatpriceDiff(quot.getQuotMatpriceDiff());
+            q.setQuotJswCheckUserNickname(quot.getQuotJswCheckUserNickname());//金思维审核人
             q.setQuotJswApprovalStatus("2");
 
             List<QuotMaterial> qmaterials = new ArrayList<QuotMaterial>();

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

@@ -21,6 +21,9 @@ public class quotModel {
     @ApiModelProperty("整单料价价差率")
     private String quotMatpriceDiff;//整单料价价差率
 
+    @ApiModelProperty("金思维审核人")
+    private String quotJswCheckUserNickname;
+
     @ApiModelProperty("产品明细")
     private List<quotMaterialModel> quotMaterial;//明细
 
@@ -64,6 +67,10 @@ public class quotModel {
         this.quotMatpriceDiff = quotMatpriceDiff;
     }
 
+    public String getQuotJswCheckUserNickname() { return quotJswCheckUserNickname; }
+
+    public void setQuotJswCheckUserNickname(String quotJswCheckUserNickname) { this.quotJswCheckUserNickname = quotJswCheckUserNickname; }
+
     public List<quotMaterialModel> getQuotMaterial() {
         return quotMaterial;
     }

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

@@ -115,6 +115,9 @@ public class Quot extends BaseEntity
     /** 审核人 */
     private String quotCheckUserNickname;
 
+    /** 金思维审核人 */
+    private String quotJswCheckUserNickname;
+
     /** 提交状态 */
     @Excel(name = "提交状态",dictType  = "quot_approval_status")
     private String quotApprovalStatus;
@@ -355,6 +358,9 @@ public class Quot extends BaseEntity
     {
         return quotCheckUserName;
     }
+    public String getQuotJswCheckUserNickname() { return quotJswCheckUserNickname; }
+
+    public void setQuotJswCheckUserNickname(String quotJswCheckUserNickname) { this.quotJswCheckUserNickname = quotJswCheckUserNickname; }
     public void setQuotCheckUserNickname(String quotCheckUserNickname) { this.quotCheckUserNickname = quotCheckUserNickname; }
 
     public String getQuotCheckUserNickname()

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

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotTotalPrice"    column="quot_total_price"    />
         <result property="quotCheckUserName"    column="quot_check_user_name"    />
         <result property="quotCheckUserNickname"    column="quot_check_user_nickname"    />
+        <result property="quotJswCheckUserNickname"    column="quot_jsw_check_user_nickname"    />
         <result property="quotApprovalStatus"    column="quot_approval_status"    />
         <result property="quotMaterialsCount"    column="quot_materials_count"    />
         <result property="quotRbDateUid"    column="quot_rbDateUid"    />
@@ -117,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.quot_customer_name,a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts,
                a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from,
                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_approval_status,a.quot_materials_count,a.quot_rbDateUid,
+               a.quot_check_user_name, u2.nick_name quot_check_user_nickname,a.quot_jsw_check_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,
 
@@ -164,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.quot_id, a.quot_code,a.quot_jsw_code, a.quot_salesman_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_bm,a.quot_customer_name,
                a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date,
                a.quot_project, a.quot_quotation_date, a.quot_quotation_from, 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_approval_status,a.quot_rbDateUid,
+               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_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,
 
@@ -206,8 +207,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by b.number
     </select>
 
-    <select id="selectQuotByQuotCode">
+    <select id="selectQuotByQuotCode" resultType="String">
-        select quot_id from quot where quot_code = #{quotCode}
+        select top 1 quot_id from quot where quot_code = #{quotCode}
     </select>
 
 
@@ -406,6 +407,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">quot_matprice_diff2 = #{quotMatpriceDiff2},</if>
             <if test="quotPrint != null and quotPrint != ''">quot_print = #{quotPrint},</if>
             <if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name = #{quotPrintUserName},</if>
+            <if test="quotJswCheckUserNickname != null and quotJswCheckUserNickname != ''">quot_jsw_check_user_nickname = #{quotJswCheckUserNickname},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

ruoyi-ui/src/views/quot/quot/index.vue

@@ -410,7 +410,7 @@
               <el-input v-model="form.quotLvPrice" :disabled="true"/>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])">
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION','QUOT_MAT_PRICE_DIFF'])">
             <el-form-item label="整单料价价差率" prop="quotMatpriceDiff">
               <el-input v-model="form.quotMatpriceDiff" :disabled="true"/>
             </el-form-item>
@@ -1709,7 +1709,7 @@ export default {
         });
 
         this.form.quotQuantity = this.sumMatSl;
-        this.form.quotTotalPrice = this.sumMatQuotAllPrice;
+        this.form.quotTotalPrice = this.form.quotTotalPrice;
         this.form.quotMaterialsCount = this.quotMaterialList.length;
       }
     },
@@ -1753,7 +1753,8 @@ export default {
         }
       });
       this.form.quotQuantity = sums[6];
-      this.form.quotTotalPrice = this.form.quotTotalPrice?this.form.quotTotalPrice:checkRole(['QUOT_MAT_PRICE_DIFF'])? sums[14] : sums[13];
+      this.form.quotTotalPrice = checkRole(['QUOT_MAT_PRICE_DIFF'])? (sums[14]==0?(this.form.quotTotalPrice?this.form.quotTotalPrice:sums[14]):sums[14]) : (sums[13]==0?(this.form.quotTotalPrice?this.form.quotTotalPrice:sums[13]):sums[13]);
+      //this.form.quotTotalPrice = this.form.quotTotalPrice?this.form.quotTotalPrice:checkRole(['QUOT_MAT_PRICE_DIFF'])? sums[14] : sums[13];
       this.form.quotMaterialsCount = this.form.quotMaterialsCount?this.form.quotMaterialsCount:data.length;
       return sums;
   },