xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-06-03 11:27:13 +08:00
parent ed01e80503
commit 16ddb1c7f6
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,5 +1,5 @@
#for tests only ! #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.destination.pool_capacity=10
jco.client.lang=ZH jco.client.lang=ZH
jco.client.ashost=172.19.0.120 jco.client.ashost=172.19.0.120
@ -7,5 +7,5 @@ jco.client.saprouter=
jco.client.user=RFC jco.client.user=RFC
jco.client.sysnr=00 jco.client.sysnr=00
jco.destination.peak_limit=10 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 jco.client.client=300

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
View File

@ -227,7 +227,6 @@ public class CustomerController extends BaseController
customer.setUpdateBy(getUsername()); customer.setUpdateBy(getUsername());
customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核
}else{// 数据组创建的客户数据提交SAP }else{// 数据组创建的客户数据提交SAP
customer.setCusId(UUID.fastUUID().toString());
customer.setCusCode(IdUtils.createNo("KH_",2)); customer.setCusCode(IdUtils.createNo("KH_",2));
customer.setCreateBy(getUsername()); customer.setCreateBy(getUsername());
customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核
@ -250,6 +249,7 @@ public class CustomerController extends BaseController
if(StringUtils.isNotEmpty(customer.getCusId())) {// 数据组 提交业务员创建的客户数据提交SAP if(StringUtils.isNotEmpty(customer.getCusId())) {// 数据组 提交业务员创建的客户数据提交SAP
customerService.updateCustomer(customer); customerService.updateCustomer(customer);
}else{ }else{
customer.setCusId(UUID.fastUUID().toString());
customerService.insertCustomer(customer); customerService.insertCustomer(customer);
} }
}else{ }else{

1
ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java
View File

@ -449,6 +449,7 @@ public class SapRfcUtils {
JCoStructure jCoStructure = input.getStructure("IS_CUSTOMER"); JCoStructure jCoStructure = input.getStructure("IS_CUSTOMER");
jCoStructure.setValue("KTOKK",customer.getCusGroup());//客户账户组 jCoStructure.setValue("KTOKK",customer.getCusGroup());//客户账户组
jCoStructure.setValue("TITLE_MEDI","0003");//称谓文本 jCoStructure.setValue("TITLE_MEDI","0003");//称谓文本
jCoStructure.setValue("KUNNR",customer.getCusSapCode());//客户SAP编码
jCoStructure.setValue("NAME1",customer.getCusName());//客户名称 jCoStructure.setValue("NAME1",customer.getCusName());//客户名称
jCoStructure.setValue("SORT1",customer.getCusName());//搜索项1 jCoStructure.setValue("SORT1",customer.getCusName());//搜索项1
jCoStructure.setValue("LANGU",customer.getCusLanguage());//SAP 语言代码 jCoStructure.setValue("LANGU",customer.getCusLanguage());//SAP 语言代码

4
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -131,7 +131,7 @@
></el-switch> ></el-switch>
</template> </template>
</el-table-column> </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="quotSalesmanName" width="150px"/>
<el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/> <el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
<el-table-column label="项目名称" align="center" prop="quotProject" 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 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: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: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> <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> </div>