From 1b8f02a97c455940fd677c37975b4592e3a4b81b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 25 Aug 2023 14:19:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E8=B0=83=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliangneigou/cheliangneigouAdd.vue | 16 ++++++++++++++++ .../neigouguanli/neigouEdit.vue | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue index cc66f1d8be..b5bdfa7d09 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue @@ -392,6 +392,22 @@ export default { submitVehicleApply() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.baseInternalPurchaseVehicles.length > 0) { + for (var i = 0; i < this.formobj.baseInternalPurchaseVehicles.length; i++) { + if (this.formobj.baseInternalPurchaseVehicles[i].witPinMoney == '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中内销价格不能为空' }) + return + } + if (this.formobj.baseInternalPurchaseVehicles[i].freight == '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中运费不能为空' }) + return + } + if (this.formobj.baseInternalPurchaseVehicles[i].freight !== '' && this.formobj.baseInternalPurchaseVehicles[i].freight !== '0' && this.formobj.baseInternalPurchaseVehicles[i].freightUndertakerType == '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中运费承担方不能为空' }) + return + } + } + } this.submitdisabled = true req.submitVehicleApply(this.formobj).then((res) => { if (res.success) { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue index 7d08562ee5..f31de4d23c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue @@ -382,6 +382,22 @@ export default { submitVehicleApply() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.baseInternalPurchaseVehicles.length > 0) { + for (var i = 0; i < this.formobj.baseInternalPurchaseVehicles.length; i++) { + if (this.formobj.baseInternalPurchaseVehicles[i].witPinMoney == '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中内销价格不能为空' }) + return + } + if (this.formobj.baseInternalPurchaseVehicles[i].freight == '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中运费不能为空' }) + return + } + if (this.formobj.baseInternalPurchaseVehicles[i].freight !== '' && this.formobj.baseInternalPurchaseVehicles[i].freight !== '0' && this.formobj.baseInternalPurchaseVehicles[i].freightUndertakerType == '') { + this.$message({ showClose: true, type: 'error', message: '车辆列表中运费承担方不能为空' }) + return + } + } + } this.submitdisabled = true req.submitVehicleApply(this.formobj).then((res) => { if (res.success) { From 9fd6696c0a979b23db6cb411c51bd4d169eda79d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 25 Aug 2023 15:43:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderDetailsVo.java | 3 ++ .../bussalesorder/BusSalesOrderService.java | 30 ++++++++++++++++++- .../CrmVehicledemandsDto.java | 14 +++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandsDto.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 8b7af181fc..03bdd2e2b4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -175,4 +175,7 @@ public class BusSalesOrderDetailsVo implements Vo { private String financePlan; private String orgSidPath; + + @ApiModelProperty(value = "总优惠") + private String totaldiscount; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index f89fc48da6..181bc6f19a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -581,10 +581,19 @@ public class BusSalesOrderService extends MybatisBaseService discountList = busSalesOrderDiscountService.selectDiscount(sid); + discountList.removeAll(Collections.singleton(null)); + if (!discountList.isEmpty()) { + BigDecimal bigDecimalAll = new BigDecimal("0"); + for (AppOrderDiscountListVo v : discountList) { + bigDecimalAll = bigDecimalAll.add(new BigDecimal(v.getTotal())); + } + vo.setTotaldiscount(bigDecimalAll.toString()); + } /*************************************************价格信息*****************************************************/ BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(entity.getSid()); //计算单台折让 - BigDecimal bigDecimalSing = new BigDecimal("0"); + /* BigDecimal bigDecimalSing = new BigDecimal("0"); if (busSalesOrderPriceDetailsVo != null) { //销售指导价-成交价+单车优惠包成本+单车返利）：***元（单车优惠包成本是总优惠包价值除以台数） if (StringUtils.isNotBlank(busSalesOrderPriceDetailsVo.getSingleGuildPrice())) { @@ -622,7 +631,26 @@ public class BusSalesOrderService extends MybatisBaseService