|
|
|
|
@ -23,6 +23,7 @@ import org.springblade.desk.order.service.IYieldOrderDailyAssignService; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
import java.math.RoundingMode; |
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
|
import java.time.LocalTime; |
|
|
|
|
@ -179,10 +180,10 @@ public class YieldOrderDailyAssignImpl extends BaseServiceImpl<YieldOrderDailyAs |
|
|
|
|
if (bpas.getWeekAssign() == null || bpas.getWeekAssign().compareTo(BigDecimal.ZERO) == 0) { |
|
|
|
|
bpas.setFactor(bpas.getAssignScale().divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(10000)) ); |
|
|
|
|
} else { |
|
|
|
|
if(bpas.getClassifyAssign().compareTo(BigDecimal.ZERO) ==0){ |
|
|
|
|
if (bpas.getClassifyAssign().compareTo(BigDecimal.ZERO) == 0) { |
|
|
|
|
bpas.setFactor(BigDecimal.ZERO); |
|
|
|
|
}else{ |
|
|
|
|
bpas.setFactor(bpas.getAssignScale().divide(BigDecimal.valueOf(100)).divide (bpas.getWeekAssign().divide(bpas.getClassifyAssign()))); |
|
|
|
|
} else { |
|
|
|
|
bpas.setFactor(bpas.getAssignScale().divide(BigDecimal.valueOf(100)).divide(bpas.getWeekAssign().divide(bpas.getClassifyAssign(), 5, RoundingMode.HALF_UP), 5, RoundingMode.HALF_UP)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
planAssignSteerService.updateById(bpas); |
|
|
|
|
|