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

'123'

This commit is contained in:
xd 2024-06-07 08:25:07 +08:00
parent 4da52cefec
commit e8815264a9
6 changed files with 17 additions and 16 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 !
#Thu Jun 06 14:19:16 CST 2024 #Fri Jun 07 08:18:57 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=fyP*^^S)mI4.TUT*}uMrHy])~sv.u}p[_7L*O}z3,^XTYYOu jco.client.passwd=wcV2,:%3ns!n1TrQ,`o|.r`%fsDCCa5oz~~`VEonO~?t$xIU
jco.client.client=300 jco.client.client=300

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

@ -162,7 +162,7 @@ public class CustomerController extends BaseController
public AjaxResult add(@RequestBody Customer customer) public AjaxResult add(@RequestBody Customer customer)
{ {
customer.setCusId(UUID.fastUUID().toString()); customer.setCusId(UUID.fastUUID().toString());
customer.setCusCode(IdUtils.createNo("KH_",2)); customer.setCusCode(IdUtils.createNo("KH_",0));
customer.setCreateBy(getUsername()); customer.setCreateBy(getUsername());
return toAjax(customerService.insertCustomer(customer)); return toAjax(customerService.insertCustomer(customer));
} }
@ -192,7 +192,7 @@ public class CustomerController extends BaseController
if(StringUtils.isEmpty(cus_id)){ if(StringUtils.isEmpty(cus_id)){
customer.setCusId(UUID.fastUUID().toString()); customer.setCusId(UUID.fastUUID().toString());
customer.setCusCode(IdUtils.createNo("KH_",2)); customer.setCusCode(IdUtils.createNo("KH_",0));
customer.setCreateBy(getUsername()); customer.setCreateBy(getUsername());
customerService.insertCustomer(customer); customerService.insertCustomer(customer);
sendNotice(customer);//发送消息至数据组 sendNotice(customer);//发送消息至数据组
@ -235,7 +235,7 @@ public class CustomerController extends BaseController
customer.setUpdateBy(getUsername()); customer.setUpdateBy(getUsername());
customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核
}else{// 数据组创建的客户数据提交SAP }else{// 数据组创建的客户数据提交SAP
customer.setCusCode(IdUtils.createNo("KH_",2)); customer.setCusCode(IdUtils.createNo("KH_",0));
customer.setCreateBy(getUsername()); customer.setCreateBy(getUsername());
customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核
} }

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

@ -173,7 +173,7 @@ public class QuotController extends BaseController
public AjaxResult add(@RequestBody Quot quot) public AjaxResult add(@RequestBody Quot quot)
{ {
quot.setQuotId(UUID.fastUUID().toString()); quot.setQuotId(UUID.fastUUID().toString());
quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setQuotCode(IdUtils.createNo("BJD_",0));
quot.setCreateBy(getUsername()); quot.setCreateBy(getUsername());
quot.setQuotSalesmanCode(getUsername()); quot.setQuotSalesmanCode(getUsername());
quot.setUpdateBy(getUsername()); quot.setUpdateBy(getUsername());
@ -313,7 +313,7 @@ public class QuotController extends BaseController
if(StringUtils.isEmpty(quot_id)){ if(StringUtils.isEmpty(quot_id)){
quot.setQuotId(UUID.fastUUID().toString()); quot.setQuotId(UUID.fastUUID().toString());
quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setQuotCode(IdUtils.createNo("BJD_",0));
quot.setCreateBy(getUsername()); quot.setCreateBy(getUsername());
quot.setQuotSalesmanCode(getUsername()); quot.setQuotSalesmanCode(getUsername());
quotService.insertQuot(quot); quotService.insertQuot(quot);
@ -359,7 +359,7 @@ public class QuotController extends BaseController
QuotJsqr quotJsqr = new QuotJsqr(); QuotJsqr quotJsqr = new QuotJsqr();
String quotJsqrId = UUID.fastUUID().toString(); String quotJsqrId = UUID.fastUUID().toString();
quotJsqr.setQuotJsqrId(quotJsqrId); quotJsqr.setQuotJsqrId(quotJsqrId);
quotJsqr.setQuotJsqrCode(IdUtils.createNo("BJD_JSQR_",2)); quotJsqr.setQuotJsqrCode(IdUtils.createNo("BJD_JSQR_",0));
//特缆、低压、中压、其他 协助状态设置 //特缆、低压、中压、其他 协助状态设置
if(quotJsxzGroup.indexOf("TL")!=-1){ if(quotJsxzGroup.indexOf("TL")!=-1){
@ -424,7 +424,7 @@ public class QuotController extends BaseController
QuotHj quotHj = new QuotHj(); QuotHj quotHj = new QuotHj();
String quotHjId = UUID.fastUUID().toString(); String quotHjId = UUID.fastUUID().toString();
quotHj.setQuotHjId(quotHjId); quotHj.setQuotHjId(quotHjId);
quotHj.setQuotHjCode(IdUtils.createNo("BJD_HJ_",2)); quotHj.setQuotHjCode(IdUtils.createNo("BJD_HJ_",0));
quotHj.setQuotHjPricingType("10");//核价类型 设置为 报价核价 quotHj.setQuotHjPricingType("10");//核价类型 设置为 报价核价
quotHj.setCreateBy(getUsername()); quotHj.setCreateBy(getUsername());
@ -557,7 +557,6 @@ public class QuotController extends BaseController
@PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')") @PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')")
public void madeQuot(HttpServletResponse response, @RequestBody Quot quot) public void madeQuot(HttpServletResponse response, @RequestBody Quot quot)
{ {
quotService.updateQuot(quot);
List<QuotMaterial> list = quot.getQuotMaterialList(); List<QuotMaterial> list = quot.getQuotMaterialList();
excelUtil.exportQuotExcel(response,quot,list); excelUtil.exportQuotExcel(response,quot,list);
} }

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

@ -226,7 +226,7 @@ public class RedBookController extends BaseController
{ {
if(StringUtils.isEmpty(quot.getQuot_id())){ if(StringUtils.isEmpty(quot.getQuot_id())){
quot.setQuot_id(UUID.fastUUID().toString()); quot.setQuot_id(UUID.fastUUID().toString());
quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setQuotCode(IdUtils.createNo("BJD_",0));
quot.setCreateBy(getUsername()); quot.setCreateBy(getUsername());
redBookService.insertOAQuot(quot); redBookService.insertOAQuot(quot);
}else{ }else{

1
ruoyi-ui/src/store/modules/user.js
View File

@ -7,6 +7,7 @@ const user = {
token: getToken(), token: getToken(),
id: '', id: '',
name: '', name: '',
nickName: '',
avatar: '', avatar: '',
roles: [], roles: [],
permissions: [], permissions: [],

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

@ -336,13 +336,13 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null"> <el-row :gutter="8">
<el-col :span="6"> <el-col :span="6" v-if="checkRole(['QUOT'])">
<el-form-item label="铜价" prop="quotTongPrice"> <el-form-item label="铜价" prop="quotTongPrice">
<el-input v-model="form.quotTongPrice" :disabled="true"/> <el-input v-model="form.quotTongPrice" :disabled="true"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6" v-if="checkRole(['QUOT'])">
<el-form-item label="铝价" prop="quotLvPrice"> <el-form-item label="铝价" prop="quotLvPrice">
<el-input v-model="form.quotLvPrice" :disabled="true"/> <el-input v-model="form.quotLvPrice" :disabled="true"/>
</el-form-item> </el-form-item>
@ -1235,8 +1235,9 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.activeName = "quotInfo"; this.activeName = "quotInfo";
this.form.quotSalesmanName = this.$store.state.user.sapUserName; this.form.quotSalesmanName = this.$store.state.user.nickName;
this.form.quotSalesmanBm = this.$store.state.user.sapBm; //this.form.quotSalesmanName = this.$store.state.user.sapUserName;
//this.form.quotSalesmanBm = this.$store.state.user.sapBm;
this.form.quotSalesmanDeptId = this.$store.state.user.deptId; this.form.quotSalesmanDeptId = this.$store.state.user.deptId;
this.form.quotSalesmanDeptName = this.$store.state.user.deptName; this.form.quotSalesmanDeptName = this.$store.state.user.deptName;
}, },