From 16ddb1c7f63e6da905ae6b24bb51cd2a54a7cce4 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 3 Jun 2024 11:27:13 +0800
Subject: [PATCH] '123'

---
 ABAP_AS_WITH_POOL.jcoDestination                              | 4 ++--
 .../com/ruoyi/web/controller/customer/CustomerController.java | 2 +-
 .../java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java     | 1 +
 ruoyi-ui/src/views/quot/quot/index.vue                        | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index d913671..bab5541 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,5 +1,5 @@
 #for tests only !
-#Fri May 31 09:03:02 CST 2024
+#Mon Jun 03 10:50:48 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.120
@@ -7,5 +7,5 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
-jco.client.passwd=dK4Y;AwNNY+M!AP8*j!bqsNgHiN+no{qJ7swP{yqQ,;.~I8T
+jco.client.passwd=654321
 jco.client.client=300
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
index 2bceeff..9861aba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
@@ -227,7 +227,6 @@ public class CustomerController extends BaseController
             customer.setUpdateBy(getUsername());
             customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核
         }else{// 数据组创建的客户数据提交SAP
-            customer.setCusId(UUID.fastUUID().toString());
             customer.setCusCode(IdUtils.createNo("KH_",2));
             customer.setCreateBy(getUsername());
             customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核
@@ -250,6 +249,7 @@ public class CustomerController extends BaseController
             if(StringUtils.isNotEmpty(customer.getCusId())) {// 数据组 提交业务员创建的客户数据提交SAP
                 customerService.updateCustomer(customer);
             }else{
+                customer.setCusId(UUID.fastUUID().toString());
                 customerService.insertCustomer(customer);
             }
         }else{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java
index bb68be9..2136654 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java
@@ -449,6 +449,7 @@ public class SapRfcUtils {
             JCoStructure jCoStructure = input.getStructure("IS_CUSTOMER");
             jCoStructure.setValue("KTOKK",customer.getCusGroup());//客户账户组
             jCoStructure.setValue("TITLE_MEDI","0003");//称谓文本
+            jCoStructure.setValue("KUNNR",customer.getCusSapCode());//客户SAP编码
             jCoStructure.setValue("NAME1",customer.getCusName());//客户名称
             jCoStructure.setValue("SORT1",customer.getCusName());//搜索项1
             jCoStructure.setValue("LANGU",customer.getCusLanguage());//SAP 语言代码
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index 8d771f1..5157dc4 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -131,7 +131,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="打印人" align="center" prop="quotPrintUserName" width="150px"/>
+      <el-table-column label="打印人" align="center" prop="quotPrintUserName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/>
       <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
       <el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
       <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
@@ -1295,7 +1295,7 @@
         <span v-hasPermi="['quot:quot:assist']"><el-button type="primary" plain @click="commitJsForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus == '0'">提交技术协助</el-button></span>
         <span style="margin-left: 10px" v-hasPermi="['quot:quot:assistHj']"><el-button type="primary" plain @click="commitHjForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotHjApprovalStatus == '0'">提交核价审核</el-button></span>
 
-        <span style="margin-left: 10px" v-hasPermi="['quot:quot:madeQuot']"><el-button type="warning" style="float:left" plain @click="madeQuot" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">生成报价单</el-button></span>
+        <span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:madeQuot']"><el-button type="warning" plain @click="madeQuot" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">生成报价单</el-button></span>
         <span style="margin-left: 10px" v-hasPermi="['quot:quot:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">提交反馈</el-button></span>
         <span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">驳回</el-button></span>
       </div>