yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
c909730fdc ad6d4e4e92
commit
4123507d4c
6 changed files with 25 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  3. 8
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  4. 2
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
  5. 12
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
  6. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -983,7 +983,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
//计算总指导价-总成交价-总优惠包的价值
bigDecimalOne = guildPriceAll.subtract(finalPriceAll).subtract(discountPrice);
bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
List<String> vehicleList = new ArrayList<>();
//是否是现车//ToDo:暂去掉
/*if ("1".equals(busSalesOrder.getType())) {
@ -1028,11 +1028,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<String> resultBean1 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery);
if (resultBean1.getSuccess()) {
String price = resultBean1.getData();
//ToDo:计算是否超权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
//ToDo:修改公式计算是否超权限：岗位权限*台数>总指导价-总成交价+总优惠包+总返利
//销售支持部经理的岗位权限价格
BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
bigDecimalTwo = bigDecimal2.add(initBigDecimal);
//判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
bigDecimalTwo = bigDecimal2;
bigDecimalOne = bigDecimalOne.add(initBigDecimal);
if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
//bigDecimalTwo<bigDecimalOne
isHavePower = true;
@ -1056,12 +1056,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<String> resultBean2 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery);
if (resultBean2.getSuccess()) {
String price = resultBean2.getData();
//ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额>总指导价-总成交价-优惠包总价值
//ToDo:计算是否有权限：岗位权限*台数>总指导价-总成交价+总优惠包+总返利
//总经理的岗位权限价格
bigDecimalTwo = new BigDecimal("0");
BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
bigDecimalTwo = bigDecimal2.add(initBigDecimal);
//判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
bigDecimalTwo = bigDecimal2;
bigDecimalOne = bigDecimalOne.add(initBigDecimal);
if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
//bigDecimalTwo<bigDecimalOne
isPower = true;

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -202,7 +202,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
if (orderInfo != null) {
BeanUtil.copyProperties(orderInfo, busSalesOrderModel1, "sid");
busSalesOrderModel1.setSalesOrderSid(salesOrderSid);
busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
if(StringUtils.isNotBlank(guildPrice)){
busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
}
busSalesOrderModel1.setBrandName(brandName);
busSalesOrderModel1.setBrandSid(brandSid);
busSalesOrderModel1.setModelConfig(modelAlias);

8
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -7,7 +7,7 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
/*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
/*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
@ -22,7 +22,7 @@ public enum ProcDefEnum {
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:6:820004"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25
@ -48,7 +48,7 @@ public enum ProcDefEnum {
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:6:1065004"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
@ -73,7 +73,7 @@ public enum ProcDefEnum {
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id*/
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id
;

2
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
View File

@ -10,7 +10,7 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="使用组织">
<el-select v-model="queryParams.params.useOrgSid" placeholder="请选择" filterable clearable class="addinputw">
<el-select v-model="queryParams.params.useOrgSid" placeholder="请选择" filterable class="addinputw">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>

12
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
View File

@ -94,7 +94,7 @@
<script>
import req from '@/api/anruiscm/scmwarehouse'
import { typeValues, getGressionUserList, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import { typeValues, getGressionUserList, getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
export default {
name: 'ScmWarehouseAdd',
@ -163,15 +163,19 @@ export default {
getUseOrg() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.useOrg = res.data.name // 使用组织
this.formobj.useOrgSid = res.data.sid // 使用组织sid
fetchBySid(res.data).then((resp) => {
if (resp.success) {
this.formobj.useOrg = res.data.name // 使用组织
}
})
this.formobj.useOrgSid = res.data // 使用组织sid
}
})
},
// 组织(单选)
getOrg() {
req.getOrg().then((res) => {
if (res.code === '200') {
if (res.success) {
this.useOrg_list = res.data
console.log('使用组织', this.useOrg_list)
}

4
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
View File

@ -283,7 +283,7 @@ export default {
// 分公司
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.useOrgSid = res.data.sid
this.listQuery.params.useOrgSid = res.data
this.getList() // 加载列表
}
})
@ -492,7 +492,7 @@ export default {
this.listLoading = true
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.useOrgSid = res.data.sid
this.listQuery.params.useOrgSid = res.data
pagerList(this.listQuery).then((response) => {
this.listLoading = false
if (

Write Preview
Loading…
Cancel
Save