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 417264ef..3b2b47bc 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 @@ -534,114 +534,113 @@ public class SaleorderitemController { } @Transactional - public void settlement(List salesorderItem0List) throws DataException { - for (Salesorder_item0Entity entity : salesorderItem0List){ - PoundlistEntity poundlistEntity = poundlistService.getInfo(entity.getPoundlistId()); - if (ObjectUtils.isNotEmpty(poundlistEntity)){ - //磅单调整 - PoundlistEntity poundlistEntityCopy = new PoundlistEntity(); - BeanUtils.copyProperties(poundlistEntity, poundlistEntityCopy); - String mainId =RandomUtil.uuId(); - poundlistEntityCopy.setSalesStatus("99"); - poundlistEntityCopy.setSalesorderId(null); - BigDecimal newSettlement = poundlistEntity.getSettlement().subtract(entity.getSettlement()); - poundlistEntityCopy.setSettlement(newSettlement); - poundlistEntityCopy.setPurchaseAmounts(poundlistEntity.getPurchasePrice().multiply(newSettlement).setScale(2,BigDecimal.ROUND_HALF_UP)); - poundlistEntityCopy.setSalesAmounts(poundlistEntity.getSalesPrice().multiply(newSettlement).setScale(2,BigDecimal.ROUND_HALF_UP)); - poundlistEntityCopy.setSourceId(poundlistEntity.getId()); - poundlistEntityCopy.setId(mainId); - poundlistService.save(poundlistEntityCopy); - poundlistEntity.setSettlement(entity.getSettlement()); - poundlistEntity.setPurchaseAmounts(poundlistEntity.getPurchaseAmounts().subtract(poundlistEntityCopy.getPurchaseAmounts().setScale(2,BigDecimal.ROUND_HALF_UP))); - poundlistService.updateById(poundlistEntity); - //采购订单调整 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Purchaseorder_item0Entity::getPoundlistId,poundlistEntity.getId()); - Purchaseorder_item0Entity purchaseorder_item0Entity = purchaseorder_item0Service.getOne(queryWrapper); - if (ObjectUtils.isNotEmpty(purchaseorder_item0Entity)){ - Purchaseorder_item0Entity purchaseorder_item0EntityCopy = new Purchaseorder_item0Entity(); - BeanUtils.copyProperties(purchaseorder_item0Entity,purchaseorder_item0EntityCopy); - purchaseorder_item0Entity.setSettlement(entity.getSettlement()); - purchaseorder_item0Entity.setAmount(poundlistEntity.getPurchaseAmounts()); - switch (purchaseorder_item0Entity.getRate()) { - case "1": - purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.09"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "2": - purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.06"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "3": - purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.05"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "4": - purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.03"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "5": - purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1"),2,BigDecimal.ROUND_HALF_UP)); - break; - default: - purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP)); - break; - } - purchaseorder_item0Service.updateById(purchaseorder_item0Entity); - String purchaseItemId =RandomUtil.uuId(); - purchaseorder_item0EntityCopy.setId(purchaseItemId); - purchaseorder_item0EntityCopy.setPoundlistId(poundlistEntityCopy.getId()); - purchaseorder_item0EntityCopy.setSettlement(poundlistEntityCopy.getSettlement()); - purchaseorder_item0EntityCopy.setAmount(poundlistEntityCopy.getPurchaseAmounts()); - switch (purchaseorder_item0EntityCopy.getRate()) { - case "1": - purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.09"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "2": - purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.06"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "3": - purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.05"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "4": - purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.03"),2,BigDecimal.ROUND_HALF_UP)); - break; - case "5": - purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1"),2,BigDecimal.ROUND_HALF_UP)); - break; - default: - purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP)); - break; - } - purchaseorder_item0Service.save(purchaseorder_item0EntityCopy); + public void settlement(Salesorder_item0Entity salesorderItem0Entity) throws DataException { + PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorderItem0Entity.getPoundlistId()); + if (ObjectUtils.isNotEmpty(poundlistEntity)) { + //磅单调整 + PoundlistEntity poundlistEntityCopy = new PoundlistEntity(); + BeanUtils.copyProperties(poundlistEntity, poundlistEntityCopy); + String mainId = RandomUtil.uuId(); + poundlistEntityCopy.setSalesStatus("99"); + poundlistEntityCopy.setSalesorderId(null); + BigDecimal newSettlement = poundlistEntity.getSettlement().subtract(salesorderItem0Entity.getSettlement()); + poundlistEntityCopy.setSettlement(newSettlement); + poundlistEntityCopy.setPurchaseAmounts(poundlistEntity.getPurchasePrice().multiply(newSettlement).setScale(2, BigDecimal.ROUND_HALF_UP)); + poundlistEntityCopy.setSalesAmounts(poundlistEntity.getSalesPrice().multiply(newSettlement).setScale(2, BigDecimal.ROUND_HALF_UP)); + poundlistEntityCopy.setSourceId(poundlistEntity.getId()); + poundlistEntityCopy.setId(mainId); + poundlistEntityCopy.setPoundlistNo(poundlistEntity.getPoundlistNo() + "-1"); + poundlistService.save(poundlistEntityCopy); + poundlistEntity.setSettlement(salesorderItem0Entity.getSettlement()); + poundlistEntity.setPurchaseAmounts(poundlistEntity.getPurchaseAmounts().subtract(poundlistEntityCopy.getPurchaseAmounts().setScale(2, BigDecimal.ROUND_HALF_UP))); + poundlistService.updateById(poundlistEntity); + //采购订单调整 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Purchaseorder_item0Entity::getPoundlistId, poundlistEntity.getId()); + Purchaseorder_item0Entity purchaseorder_item0Entity = purchaseorder_item0Service.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(purchaseorder_item0Entity)) { + Purchaseorder_item0Entity purchaseorder_item0EntityCopy = new Purchaseorder_item0Entity(); + BeanUtils.copyProperties(purchaseorder_item0Entity, purchaseorder_item0EntityCopy); + purchaseorder_item0Entity.setSettlement(salesorderItem0Entity.getSettlement()); + purchaseorder_item0Entity.setAmount(poundlistEntity.getPurchaseAmounts()); + switch (purchaseorder_item0Entity.getRate()) { + case "1": + purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.09"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "2": + purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.06"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "3": + purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.05"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "4": + purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.03"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "5": + purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1"), 2, BigDecimal.ROUND_HALF_UP)); + break; + default: + purchaseorder_item0Entity.setNotAmount(purchaseorder_item0Entity.getAmount().divide(new BigDecimal("1.13"), 2, BigDecimal.ROUND_HALF_UP)); + break; + } + purchaseorder_item0Service.updateById(purchaseorder_item0Entity); + String purchaseItemId = RandomUtil.uuId(); + purchaseorder_item0EntityCopy.setId(purchaseItemId); + purchaseorder_item0EntityCopy.setPoundlistId(poundlistEntityCopy.getId()); + purchaseorder_item0EntityCopy.setSettlement(poundlistEntityCopy.getSettlement()); + purchaseorder_item0EntityCopy.setAmount(poundlistEntityCopy.getPurchaseAmounts()); + switch (purchaseorder_item0EntityCopy.getRate()) { + case "1": + purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.09"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "2": + purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.06"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "3": + purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.05"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "4": + purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.03"), 2, BigDecimal.ROUND_HALF_UP)); + break; + case "5": + purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1"), 2, BigDecimal.ROUND_HALF_UP)); + break; + default: + purchaseorder_item0EntityCopy.setNotAmount(purchaseorder_item0EntityCopy.getAmount().divide(new BigDecimal("1.13"), 2, BigDecimal.ROUND_HALF_UP)); + break; + } + purchaseorder_item0Service.save(purchaseorder_item0EntityCopy); //入库单调整 LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); - queryWrapper1.eq(Receiptin_item0Entity::getPoundlistId,poundlistEntity.getId()); + queryWrapper1.eq(Receiptin_item0Entity::getPoundlistId, poundlistEntity.getId()); Receiptin_item0Entity receiptin_item0Entity = receiptin_item0Service.getOne(queryWrapper1); - if (ObjectUtils.isNotEmpty(receiptin_item0Entity)){ + if (ObjectUtils.isNotEmpty(receiptin_item0Entity)) { Receiptin_item0Entity receiptin_item0EntityCopy = new Receiptin_item0Entity(); - BeanUtils.copyProperties(receiptin_item0Entity,receiptin_item0EntityCopy); - receiptin_item0Entity.setNum(entity.getSettlement()); + BeanUtils.copyProperties(receiptin_item0Entity, receiptin_item0EntityCopy); + receiptin_item0Entity.setNum(salesorderItem0Entity.getSettlement()); receiptin_item0Entity.setAmount(purchaseorder_item0Entity.getAmount()); - receiptin_item0Entity.setRateamount(purchaseorder_item0Entity.getAmount().subtract(purchaseorder_item0Entity.getNotAmount().setScale(2,BigDecimal.ROUND_HALF_UP))); + receiptin_item0Entity.setRateamount(purchaseorder_item0Entity.getAmount().subtract(purchaseorder_item0Entity.getNotAmount().setScale(2, BigDecimal.ROUND_HALF_UP))); receiptin_item0Service.updateById(receiptin_item0Entity); String receiptinItemId = RandomUtil.uuId(); receiptin_item0EntityCopy.setId(receiptinItemId); receiptin_item0EntityCopy.setPoundlistId(poundlistEntityCopy.getId()); receiptin_item0EntityCopy.setNum(purchaseorder_item0EntityCopy.getSettlement()); receiptin_item0EntityCopy.setAmount(purchaseorder_item0EntityCopy.getAmount()); - receiptin_item0EntityCopy.setRateamount(purchaseorder_item0EntityCopy.getAmount().subtract(purchaseorder_item0EntityCopy.getNotAmount().setScale(2,BigDecimal.ROUND_HALF_UP))); + receiptin_item0EntityCopy.setRateamount(purchaseorder_item0EntityCopy.getAmount().subtract(purchaseorder_item0EntityCopy.getNotAmount().setScale(2, BigDecimal.ROUND_HALF_UP))); receiptin_item0EntityCopy.setBatchno(generaterSwapUtil.getBillNumber("receiptin-num", false)); receiptin_item0Service.save(receiptin_item0EntityCopy); } LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); - queryWrapper2.eq(PaymentdocItem1Entity::getPoundlistId,poundlistEntity.getId()); + queryWrapper2.eq(PaymentdocItem1Entity::getPoundlistId, poundlistEntity.getId()); PaymentdocItem1Entity paymentdocItem1Entity = paymentdocItem1Service.getOne(queryWrapper2); - if (ObjectUtils.isNotEmpty(paymentdocItem1Entity)){ + if (ObjectUtils.isNotEmpty(paymentdocItem1Entity)) { PaymentdocItem1Entity paymentdocItem1EntityCopy = new PaymentdocItem1Entity(); - BeanUtils.copyProperties(paymentdocItem1Entity,paymentdocItem1EntityCopy); + BeanUtils.copyProperties(paymentdocItem1Entity, paymentdocItem1EntityCopy); String paymentItemId = RandomUtil.uuId(); paymentdocItem1EntityCopy.setId(paymentItemId); paymentdocItem1EntityCopy.setPoundlistId(poundlistEntityCopy.getId()); paymentdocItem1Service.save(paymentdocItem1EntityCopy); } - } } } } @@ -682,7 +681,7 @@ public class SaleorderitemController { return ActionResult.fail(vehicleEntity.getTicketno() + "结算重量最多只能为" + poundlistEntity.getSettlement()); } }else if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) < 0){ - settlement(Salesorder_item0List); + settlement(salesorder_item0Entity); } } } @@ -1233,7 +1232,7 @@ public class SaleorderitemController { return ActionResult.fail(vehicleEntity.getTicketno() + "结算重量最多只能为" + poundlistEntity.getSettlement()); } }else if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) < 0){ - settlement(Salesorder_item0List); + settlement(salesorder_item0Entity); } } } diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue index 2bb35b3a..e98c5377 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue @@ -921,6 +921,7 @@ this.dataForm.num = settlement this.dataForm.price = price this.dataForm.notPrice = notPrice + this.dataForm.rate = this.jnpf.floatSub(price,notPrice); }, computeNoPrice() { let notPrice = 0;