diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java index e8e92ea5..2a278869 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.Jg_natural.entity.Jg_naturalEntity; @@ -19,6 +20,8 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -63,6 +66,9 @@ public class Jg_naturalController { @Autowired private Jg_naturalService jg_naturalService; + @Autowired + private PoundlistService poundlistService; + /** * 列表 @@ -302,6 +308,12 @@ public class Jg_naturalController { @Transactional public ActionResult delete(@PathVariable("id") String id) { Jg_naturalEntity entity = jg_naturalService.getInfo(id); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id); + List poundlistEntityList = poundlistService.list(queryWrapper); + if (poundlistEntityList.size()>0){ + return ActionResult.fail("该业务员已被使用,无法删除"); + } if (entity != null) { jg_naturalService.delete(entity); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java index b35d251c..87400ac4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.base.ActionResult; @@ -15,6 +16,8 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -63,6 +66,9 @@ public class VehicleController { @Autowired private VehicleService vehicleService; + @Autowired + private PoundlistService poundlistService; + @@ -317,9 +323,14 @@ public class VehicleController { @Transactional public ActionResult delete(@PathVariable("id") String id){ VehicleEntity entity= vehicleService.getInfo(id); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id); + List poundlistEntityList = poundlistService.list(queryWrapper); + if (poundlistEntityList.size()>0){ + return ActionResult.fail("该车辆已被使用,无法删除"); + } if(entity!=null){ vehicleService.delete(entity); - } return ActionResult.success("删除成功"); } diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index 2a285f4d..248abec3 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -403,10 +403,11 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { debugger - // this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) + // this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 debugger - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } @@ -420,7 +421,8 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue index 87ad23ce..30bc46c9 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue @@ -613,8 +613,12 @@ this.dataForm.invoicesitem0List.forEach((model, i) => { invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount); if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) } }) this.dataForm.invoiceAmount = invoiceAmount @@ -628,8 +632,14 @@ }) this.dataForm.invoicesitem0List.forEach((model, i) => { if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) + // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model.fullName,100))); + // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model.fullName),100) } }) }, diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index 1a832c64..65c3bc04 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -1009,10 +1009,10 @@ this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement) this.rateOptions.find((item) => { if (this.dataForm.salesorder_item0List[i].rate == item.id) { - this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price, (100 - item.fullName)), 100) + this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price, this.jnpf.floatAdd((1, this.jnpf.floatDiv(item.fullName,100)))) notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice) } - }) + }) if (list[i].advance == 1) { advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)) } diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue index a2bee79d..af551068 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue @@ -578,8 +578,16 @@ this.dataForm.invoicesitem0List.forEach((model, i) => { invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount); if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) + // model.amountNotTax = model.invoiceAmount * taxRateName / 100; + // model.taxAmount = model.invoiceAmount - model.amountNotTax + // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1, this.jnpf.floatDiv(taxRateName,100))); + // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,taxRateName),100) } }) this.dataForm.invoiceAmount = invoiceAmount @@ -593,8 +601,16 @@ }) this.dataForm.invoicesitem0List.forEach((model, i) => { if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ - model.amountNotTax = model.invoiceAmount * taxRateName / 100; - model.taxAmount = model.invoiceAmount - model.amountNotTax + this.taxRateOptions.forEach((model1, i) => { + if(e.taxRate == model1.id){ + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); + model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + } + }) + // model.amountNotTax = model.invoiceAmount * taxRateName / 100; + // model.taxAmount = model.invoiceAmount - model.amountNotTax + // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(taxRateName,100))); + // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,taxRateName),100) } }) }, diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index bc680dd8..bb196a8f 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -78,7 +78,7 @@ + @selection-change="handleSelectionChange" custom-column border show-summary :summary-method="getSummaries"> @@ -345,6 +345,31 @@ this.initData() }, methods: { + getSummaries(param) { + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计'; + return; + } + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value)) && (index === 6 || index === 7)) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return this.jnpf.floatAdd(prev,curr); + } else { + return prev; + } + }, 0); + } else { + sums[index] = ''; + } + }); + + return sums; + }, downLoadPDF(){ if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) { this.$message({ diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue index ebcf7e30..758c482c 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue @@ -490,10 +490,11 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { debugger - // this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) + // this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 debugger - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) } @@ -506,7 +507,8 @@ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) } }) }