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 aa3f9bd5..69707203 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 @@ -567,7 +567,7 @@ public class SaleorderitemController { poundlistEntityCopy.setSalesAmounts(poundlistEntity.getSalesPrice().multiply(newSettlement).setScale(2, BigDecimal.ROUND_HALF_UP)); poundlistEntityCopy.setSourceId(poundlistEntity.getId()); poundlistEntityCopy.setId(mainId); - poundlistEntityCopy.setPoundlistNo(poundlistEntity.getPoundlistNo() + "-1"); + 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))); @@ -650,14 +650,16 @@ public class SaleorderitemController { } LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(PaymentdocItem1Entity::getPoundlistId, poundlistEntity.getId()); - PaymentdocItem1Entity paymentdocItem1Entity = paymentdocItem1Service.getOne(queryWrapper2); - if (ObjectUtils.isNotEmpty(paymentdocItem1Entity)) { - PaymentdocItem1Entity paymentdocItem1EntityCopy = new PaymentdocItem1Entity(); - BeanUtils.copyProperties(paymentdocItem1Entity, paymentdocItem1EntityCopy); - String paymentItemId = RandomUtil.uuId(); - paymentdocItem1EntityCopy.setId(paymentItemId); - paymentdocItem1EntityCopy.setPoundlistId(poundlistEntityCopy.getId()); - paymentdocItem1Service.save(paymentdocItem1EntityCopy); + List paymentdocItem1EntityList = paymentdocItem1Service.list(queryWrapper2); + if (paymentdocItem1EntityList != null && paymentdocItem1EntityList.size()>0) { + for (PaymentdocItem1Entity paymentdocItem1Entity : paymentdocItem1EntityList) { + PaymentdocItem1Entity paymentdocItem1EntityCopy = new PaymentdocItem1Entity(); + BeanUtils.copyProperties(paymentdocItem1Entity, paymentdocItem1EntityCopy); + String paymentItemId = RandomUtil.uuId(); + paymentdocItem1EntityCopy.setId(paymentItemId); + paymentdocItem1EntityCopy.setPoundlistId(poundlistEntityCopy.getId()); + paymentdocItem1Service.save(paymentdocItem1EntityCopy); + } } } }