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