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

税率问题修改

Browse Source
product
杨世强 2 years ago
parent 91f01ac661
commit a87e451ee2
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -553,8 +553,8 @@ public class SaleorderitemController {
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId()); JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId());
for (Object purchaseId : array) { for (Object purchaseId : array) {
if (StringUtils.isNotEmpty(purchaseId.toString())) { if (StringUtils.isNotEmpty(String.valueOf(purchaseId))) {
PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getInfo(purchaseId.toString()); PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getInfo(String.valueOf(purchaseId));
if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) { if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) {
purchaseorderitemEntity.setIsTransfer("1"); purchaseorderitemEntity.setIsTransfer("1");
purchaseorderitemService.updateById(purchaseorderitemEntity); purchaseorderitemService.updateById(purchaseorderitemEntity);

3
SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
Unescape View File

@ -595,7 +595,7 @@
this.dataForm.receiptin_item0List[i].poundType = b.pound_type; this.dataForm.receiptin_item0List[i].poundType = b.pound_type;
this.rateOptions.forEach((column, index) => { this.rateOptions.forEach((column, index) => {
if (column.id == b.rate) { if (column.id == b.rate) {
this.dataForm.receiptin_item0List[i].rateamount = b.amount * column.fullName; // this.dataForm.receiptin_item0List[i].rateamount = b.amount * column.fullName;
} }
}); });
} }
@ -660,7 +660,6 @@
this.rateOptions.find((item2) => { this.rateOptions.find((item2) => {
if (item.rate == item2.id) { if (item.rate == item2.id) {
item.rateamount =this.jnpf.floatDiv(item.amount,this.jnpf.floatAdd(1, this.jnpf.floatDiv(item2.fullName,100))).toFixed(2) item.rateamount =this.jnpf.floatDiv(item.amount,this.jnpf.floatAdd(1, this.jnpf.floatDiv(item2.fullName,100))).toFixed(2)
debugger
} }
}) })
item.id = ''; item.id = '';

12
SC-web/src/views/scm/basicInformation/saleback/Form.vue
Unescape View File

@ -326,6 +326,8 @@
sums[index] = ''; sums[index] = '';
} }
}); });
this.dataForm.refundAmount = sums[7];
this.dataForm.refundNum = sums[3];
return sums; return sums;
}, },
popupSelectChange2(a, b){ popupSelectChange2(a, b){
@ -348,15 +350,15 @@
this.dataForm.saleback_item0List[i].poundlistId = b.poundlistId; this.dataForm.saleback_item0List[i].poundlistId = b.poundlistId;
this.rateOptions.find((item) => { this.rateOptions.find((item) => {
if (this.dataForm.saleback_item0List[i].rate == item.id) { if (this.dataForm.saleback_item0List[i].rate == item.id) {
this.dataForm.saleback_item0List[i].notAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.saleback_item0List[i].amount,item.fullName),100) this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatMul(this.jnpf.floatDiv(this.dataForm.saleback_item0List[i].amount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))),this.jnpf.floatDiv(item.fullName,100)).toFixed(2)
} }
}) })
sumNum = this.jnpf.floatAdd(sumNum,b.settlement); // sumNum = this.jnpf.floatAdd(sumNum,b.settlement);
sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount); // sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount);
} }
} }
this.dataForm.refundNum = sumNum; // this.dataForm.refundNum = sumNum;
this.dataForm.refundAmount = sumPrice; // this.dataForm.refundAmount = sumPrice;
this.excludeFields = excludeFields; this.excludeFields = excludeFields;
}, },
popupSelectChange(e,d){ popupSelectChange(e,d){

2
SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
Unescape View File

@ -445,7 +445,7 @@
this.dataForm.receiptout_item0List[i].deliveryNum = list[0].list[i].settlement; this.dataForm.receiptout_item0List[i].deliveryNum = list[0].list[i].settlement;
this.rateOptions.find((item) => { this.rateOptions.find((item) => {
if (this.dataForm.receiptout_item0List[i].rate == item.id) { if (this.dataForm.receiptout_item0List[i].rate == item.id) {
this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100) this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatMul(this.jnpf.floatDiv(this.dataForm.receiptout_item0List[i].amount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))),this.jnpf.floatDiv(item.fullName,100)).toFixed(2)
} }
}) })
this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit; this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;

12
SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
Unescape View File

@ -329,6 +329,8 @@
sums[index] = ''; sums[index] = '';
} }
}); });
this.dataForm.refundAmount = sums[7];
this.dataForm.refundNum = sums[3];
return sums; return sums;
}, },
popupSelectChange2(a, b){ popupSelectChange2(a, b){
@ -350,15 +352,15 @@
this.dataForm.saleback_item0List[i].poundlistId = b.poundlistId; this.dataForm.saleback_item0List[i].poundlistId = b.poundlistId;
this.rateOptions.find((item) => { this.rateOptions.find((item) => {
if (this.dataForm.saleback_item0List[i].rate == item.id) { if (this.dataForm.saleback_item0List[i].rate == item.id) {
this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.saleback_item0List[i].amount,item.fullName),100) this.dataForm.saleback_item0List[i].notAmount = this.jnpf.floatMul(this.jnpf.floatDiv(this.dataForm.saleback_item0List[i].amount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))),this.jnpf.floatDiv(item.fullName,100)).toFixed(2)
} }
}) })
sumNum = this.jnpf.floatAdd(sumNum,b.settlement); // sumNum = this.jnpf.floatAdd(sumNum,b.settlement);
sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount); // sumPrice = this.jnpf.floatAdd(sumPrice,this.dataForm.saleback_item0List[i].amount);
} }
} }
this.dataForm.refundNum = sumNum; // this.dataForm.refundNum = sumNum;
this.dataForm.refundAmount = sumPrice; // this.dataForm.refundAmount = sumPrice;
this.excludeFields = excludeFields; this.excludeFields = excludeFields;
}, },
popupSelectChange(e,d){ popupSelectChange(e,d){

Write Preview
Loading…
Cancel
Save