|
@@ -5069,7 +5069,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
if (map.get("planExtraInfoId")!=null){
|
|
if (map.get("planExtraInfoId")!=null){
|
|
BigDecimal num = new BigDecimal(String.valueOf(map.get("num")));
|
|
BigDecimal num = new BigDecimal(String.valueOf(map.get("num")));
|
|
if (planManNum>1){
|
|
if (planManNum>1){
|
|
- avg = num.divide(BigDecimal.valueOf(planManNum)).setScale(2, RoundingMode.HALF_UP);
|
|
|
|
|
|
+ avg = num.divide(BigDecimal.valueOf(planManNum)).setScale(3, RoundingMode.HALF_UP);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
// item.add(String.valueOf(map.get("num")) + " 件");
|
|
// item.add(String.valueOf(map.get("num")) + " 件");
|
|
@@ -5096,19 +5096,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
String cost = String.valueOf(map.get("cost"));
|
|
String cost = String.valueOf(map.get("cost"));
|
|
if(planType==0){
|
|
if(planType==0){
|
|
BigDecimal finishNum = new BigDecimal(map.get("finishNum")==null?String.valueOf(0):String.valueOf(map.get("finishNum")));
|
|
BigDecimal finishNum = new BigDecimal(map.get("finishNum")==null?String.valueOf(0):String.valueOf(map.get("finishNum")));
|
|
- finishNum=finishNum.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
|
|
|
|
|
|
+ finishNum=finishNum.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(3,RoundingMode.HALF_UP);
|
|
item.add(String.valueOf(finishNum.doubleValue()));
|
|
item.add(String.valueOf(finishNum.doubleValue()));
|
|
}else {
|
|
}else {
|
|
//第二种的报工工序类型
|
|
//第二种的报工工序类型
|
|
if (map.get("planExtraInfoId")!=null){
|
|
if (map.get("planExtraInfoId")!=null){
|
|
BigDecimal num = avg==null?BigDecimal.ZERO:avg;
|
|
BigDecimal num = avg==null?BigDecimal.ZERO:avg;
|
|
BigDecimal unitPrice = new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")));
|
|
BigDecimal unitPrice = new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")));
|
|
- BigDecimal total=num.multiply(unitPrice).setScale(2,RoundingMode.HALF_UP);
|
|
|
|
|
|
+ BigDecimal total=num.multiply(unitPrice).setScale(3,RoundingMode.HALF_UP);
|
|
item.add(total.toString());
|
|
item.add(total.toString());
|
|
}else {
|
|
}else {
|
|
//第一种报工工序类型
|
|
//第一种报工工序类型
|
|
BigDecimal workingTime = new BigDecimal(map.get("workingTime")==null?String.valueOf(0):String.valueOf(map.get("workingTime")));
|
|
BigDecimal workingTime = new BigDecimal(map.get("workingTime")==null?String.valueOf(0):String.valueOf(map.get("workingTime")));
|
|
- workingTime=workingTime.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
|
|
|
|
|
|
+ workingTime=workingTime.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(3,RoundingMode.HALF_UP);
|
|
item.add(String.valueOf(workingTime.doubleValue()));
|
|
item.add(String.valueOf(workingTime.doubleValue()));
|
|
}
|
|
}
|
|
}
|
|
}
|