销售结算修改

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java

@@ -24,6 +24,8 @@ import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
 import java.lang.reflect.Field;
 import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.math.RoundingMode;
 import java.util.regex.Pattern;
 import jnpf.model.QueryModel;
 import java.util.stream.Collectors;
@@ -1224,10 +1226,10 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                                     queryWrapper.lambda().eq(CwsettlementsummaryEntity::getOrdLn,warehousingOutboundProductEntity.getOrdLn());
                                     CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(queryWrapper);
                                     if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)) {
-                                        settlementRelationSaleEntity.setSaleSettlementSum(cwsettlementsummaryEntity.getSettlementSum());
+                                        settlementRelationSaleEntity.setSaleSettlementSum(warehousingOutboundProductEntity.getOutboundNumber());
-                                        settlementRelationSaleEntity.setSettlementSum(cwsettlementsummaryEntity.getSettlementSum()); //结算量
+                                        settlementRelationSaleEntity.setSettlementSum(warehousingOutboundProductEntity.getOutboundNumber()); //结算量
                                         settlementRelationSaleEntity.setSettlementPrice(cwsettlementsummaryEntity.getSettlementPrice()); //单价量
-                                        settlementRelationSaleEntity.setSettlementCount(cwsettlementsummaryEntity.getSettlementSubtotal()); //结算金额
+                                        settlementRelationSaleEntity.setSettlementCount(cwsettlementsummaryEntity.getSettlementPrice().multiply(warehousingOutboundProductEntity.getOutboundNumber()).setScale(2, RoundingMode.HALF_UP)); //结算金额
                                     }
                                     settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
                                     settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);