yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

Browse Source
product
Vayne 2 years ago
parent 531cf478ea
commit 9ea344ca54
8 changed files with 98 additions and 20 deletions
Show Stats Download Patch File Download Diff File

12
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java
Unescape View File

@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import jnpf.Jg_natural.entity.Jg_naturalEntity; import jnpf.Jg_natural.entity.Jg_naturalEntity;
@ -19,6 +20,8 @@ import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.util.*; import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum; import jnpf.util.enums.FileTypeEnum;
import jnpf.util.file.UploadUtil; import jnpf.util.file.UploadUtil;
@ -63,6 +66,9 @@ public class Jg_naturalController {
@Autowired @Autowired
private Jg_naturalService jg_naturalService; private Jg_naturalService jg_naturalService;
@Autowired
private PoundlistService poundlistService;
/** /**
* 列表 * 列表
@ -302,6 +308,12 @@ public class Jg_naturalController {
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id) { public ActionResult delete(@PathVariable("id") String id) {
Jg_naturalEntity entity = jg_naturalService.getInfo(id); Jg_naturalEntity entity = jg_naturalService.getInfo(id);
QueryWrapper<PoundlistEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id);
List<PoundlistEntity> poundlistEntityList = poundlistService.list(queryWrapper);
if (poundlistEntityList.size()>0){
return ActionResult.fail("该业务员已被使用,无法删除");
}
if (entity != null) { if (entity != null) {
jg_naturalService.delete(entity); jg_naturalService.delete(entity);

13
SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java
Unescape View File

@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
@ -15,6 +16,8 @@ import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.util.*; import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum; import jnpf.util.enums.FileTypeEnum;
import jnpf.util.file.UploadUtil; import jnpf.util.file.UploadUtil;
@ -63,6 +66,9 @@ public class VehicleController {
@Autowired @Autowired
private VehicleService vehicleService; private VehicleService vehicleService;
@Autowired
private PoundlistService poundlistService;
@ -317,9 +323,14 @@ public class VehicleController {
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id){
VehicleEntity entity= vehicleService.getInfo(id); VehicleEntity entity= vehicleService.getInfo(id);
QueryWrapper<PoundlistEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PoundlistEntity::getVehicleId,id);
List<PoundlistEntity> poundlistEntityList = poundlistService.list(queryWrapper);
if (poundlistEntityList.size()>0){
return ActionResult.fail("该车辆已被使用,无法删除");
}
if(entity!=null){ if(entity!=null){
vehicleService.delete(entity); vehicleService.delete(entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }

10
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -403,10 +403,11 @@
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) {
debugger 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.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.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100
debugger 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) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { 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].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)))
} }
}) })
} }

18
SC-web/src/views/scm/basicInformation/invoices/Form.vue
Unescape View File

@ -613,8 +613,12 @@
this.dataForm.invoicesitem0List.forEach((model, i) => { this.dataForm.invoicesitem0List.forEach((model, i) => {
invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount); invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount);
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
model.amountNotTax = model.invoiceAmount * taxRateName / 100; this.taxRateOptions.forEach((model1, i) => {
model.taxAmount = model.invoiceAmount - model.amountNotTax 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 this.dataForm.invoiceAmount = invoiceAmount
@ -628,8 +632,14 @@
}) })
this.dataForm.invoicesitem0List.forEach((model, i) => { this.dataForm.invoicesitem0List.forEach((model, i) => {
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
model.amountNotTax = model.invoiceAmount * taxRateName / 100; this.taxRateOptions.forEach((model1, i) => {
model.taxAmount = model.invoiceAmount - model.amountNotTax 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)
} }
}) })
}, },

2
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
Unescape View File

@ -1009,7 +1009,7 @@
this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement) this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)
this.rateOptions.find((item) => { this.rateOptions.find((item) => {
if (this.dataForm.salesorder_item0List[i].rate == item.id) { 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) notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice)
} }
}) })

24
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -578,8 +578,16 @@
this.dataForm.invoicesitem0List.forEach((model, i) => { this.dataForm.invoicesitem0List.forEach((model, i) => {
invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount); invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount);
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
model.amountNotTax = model.invoiceAmount * taxRateName / 100; this.taxRateOptions.forEach((model1, i) => {
model.taxAmount = model.invoiceAmount - model.amountNotTax 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 this.dataForm.invoiceAmount = invoiceAmount
@ -593,8 +601,16 @@
}) })
this.dataForm.invoicesitem0List.forEach((model, i) => { this.dataForm.invoicesitem0List.forEach((model, i) => {
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
model.amountNotTax = model.invoiceAmount * taxRateName / 100; this.taxRateOptions.forEach((model1, i) => {
model.taxAmount = model.invoiceAmount - model.amountNotTax 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)
} }
}) })
}, },

27
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -78,7 +78,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border> @selection-change="handleSelectionChange" custom-column border show-summary :summary-method="getSummaries">
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" /> <el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" />
<!-- <el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >--> <!-- <el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
@ -345,6 +345,31 @@
this.initData() this.initData()
}, },
methods: { 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(){ downLoadPDF(){
if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) { if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
this.$message({ this.$message({

10
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -490,10 +490,11 @@
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) {
debugger 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.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.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100
debugger 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) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { 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].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)))
} }
}) })
} }

Write Preview
Loading…
Cancel
Save