From faf90342d5e3624506ba1f295198ad0d3e83759d Mon Sep 17 00:00:00 2001 From: Vayne Date: Tue, 11 Apr 2023 19:39:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A3=85=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PoundlistServiceImpl.java | 3 +- .../controller/SaleorderitemController.java | 2 +- .../scm/basicInformation/arinvoices/Form.vue | 6 ++-- .../basicInformation/poundlist/salesForm.vue | 28 ++++++++++++++++++- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 9b01f845..1eabd37e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -409,8 +409,9 @@ public class PoundlistServiceImpl extends ServiceImpl customerWrapper = new LambdaQueryWrapper<>(); - customerWrapper.eq(CustomerEntity::getDepartmentId,departmentId); + customerWrapper.eq(CustomerEntity::getOrgnizeId,organizeId); customerWrapper.eq(CustomerEntity::getSupplierNm,model.getCustomerName()); CustomerEntity customerEntity = customerService.getOne(customerWrapper); String customerId = ""; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index ef54d8a8..3ba5e4d0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -519,7 +519,7 @@ public class SaleorderitemController { for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId()); if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getPurchaseStatus() != null){ - if (!poundlistEntity.getPurchaseStatus().equals("2") && !poundlistEntity.getPurchaseStatus().equals("3")){ + if (poundlistEntity.getPurchaseStatus().equals("99") || poundlistEntity.getPurchaseStatus().equals("0") || poundlistEntity.getPurchaseStatus().equals("1")){ return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开票或未入库"); } } diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index cf74c6d6..f5366928 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -492,8 +492,8 @@ sums[index] = ''; } }); - this.dataForm.invoiceQuantity = sums[4]; - this.dataForm.invoiceAmount = sums[5]; + // this.dataForm.invoiceQuantity = sums[4]; + // this.dataForm.invoiceAmount = sums[5]; return sums; }, arinvoices_item1Exist() { @@ -640,6 +640,8 @@ }, delarinvoices_item0List(index) { this.dataForm.arinvoices_item0List.splice(index, 1); + this.invoiceQuantitySum(); + this.involceAmountSum(); }, dataList(){ var _data = JSON.parse(JSON.stringify(this.dataForm)); diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index 35d70640..97410a00 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -280,7 +280,7 @@ @@ -847,6 +847,32 @@ mounted() { }, methods: { + updataPrice(row){ + var advanceAmount = 0 + var price = 0 + var notPrice = 0 + var rate = 13 + this.taxRateOptions.forEach((item, index) => { + if (item.id == row.rate) { + rate = parseInt(item.fullName) + } + }) + this.dataForm.salesorder_item0List.forEach((item, index) => { + if (row.vehicleId == item.vehicleId) { + item.unitPrice = this.jnpf.floatDiv(item.price,item.settlement).toFixed(2) //子表单价 + // item.price = this.jnpf.floatMul(item.settlement, item.unitPrice).toFixed(2)//子表金额 + item.noPrice = this.jnpf.floatDiv(item.price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate, 100))).toFixed(2)//子表不含税金额 + } + if (item.advance == '1') {//垫资 + advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price)//垫资金额 + } + price = this.jnpf.floatAdd(price, item.price)//主表金额 + notPrice = this.jnpf.floatAdd(notPrice, item.noPrice)//主表不含税金额 + }) + this.dataForm.advanceAmount = advanceAmount + this.dataForm.price = price + this.dataForm.notPrice = notPrice + }, editPrice(row) { var advanceAmount = 0 var price = 0 From e581a7ce659b837bd12efff7eb8a79c20b60d733 Mon Sep 17 00:00:00 2001 From: Vayne Date: Tue, 11 Apr 2023 20:00:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 1eabd37e..00ab3552 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -451,6 +451,7 @@ public class PoundlistServiceImpl extends ServiceImpl poundlistList = poundlistMapper.selectList(poundlistWrapper); if (poundlistList != null && poundlistList.size() != 0){ From e97cca4d8ec3afa91388e09ede44b3a29c63763d Mon Sep 17 00:00:00 2001 From: Vayne Date: Tue, 11 Apr 2023 20:18:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PoundlistServiceImpl.java | 8 ++++++-- .../scm/basicInformation/poundlist/salesForm.vue | 14 +++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 00ab3552..003387ae 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -476,8 +476,12 @@ public class PoundlistServiceImpl extends ServiceImpl { if (this.dataForm.salesorder_item0List[i].rate == item.id) { 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))).toFixed(2) @@ -1082,7 +1090,7 @@ } }) if (list[i].advance == 1) { - advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)).toFixed(2) + advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].unitPrice, list[i].settlement)).toFixed(2) } num = this.jnpf.floatAdd(num, list[i].settlement) amount = this.jnpf.floatAdd(amount, list[i].price) From 51149b081d90168a0be3a86cefc7bba8a08d5a78 Mon Sep 17 00:00:00 2001 From: BAWEI Date: Tue, 11 Apr 2023 22:47:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8D=87=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-web/src/views/workFlow/components/RecordList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SC-web/src/views/workFlow/components/RecordList.vue b/SC-web/src/views/workFlow/components/RecordList.vue index 998fbad7..b366dbaa 100644 --- a/SC-web/src/views/workFlow/components/RecordList.vue +++ b/SC-web/src/views/workFlow/components/RecordList.vue @@ -1,6 +1,6 @@