|
@@ -909,7 +909,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
|
909
|
909
|
String sumRksl = businessScedule.getSumWcsl();
|
910
|
910
|
BigDecimal s = new BigDecimal(1000);
|
911
|
911
|
BigDecimal sumRkslss = new BigDecimal(sumRksl);
|
912
|
|
- BigDecimal sumRkslD = sumRkslss.divide(s);
|
|
912
|
+ BigDecimal sumRkslD = sumRkslss.divide(s).setScale(3, BigDecimal.ROUND_DOWN);
|
913
|
913
|
|
914
|
914
|
// 赋值:设置完成数量. stripTrailingZeros() 去除结尾的0
|
915
|
915
|
businessDeliveryStorageNoticeV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
|
|
@@ -923,7 +923,8 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
|
923
|
923
|
BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
|
924
|
924
|
// 赋值:设置完成百分比.
|
925
|
925
|
businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
|
926
|
|
- businessDeliveryStorageNoticeV.setSysl(businessScedule.getSumSysl());
|
|
926
|
+ BigDecimal sumSsysl = new BigDecimal(businessScedule.getSumSysl()).divide(s).setScale(3, BigDecimal.ROUND_DOWN);
|
|
927
|
+ businessDeliveryStorageNoticeV.setSysl(sumSsysl.toString());
|
927
|
928
|
} else if ("3".equals(crkLx)) {
|
928
|
929
|
// 出库
|
929
|
930
|
// 出库数量.
|
|
@@ -946,7 +947,8 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
|
946
|
947
|
BigDecimal completeRate = complete.multiply(new BigDecimal("100"));
|
947
|
948
|
// 赋值:设置完成百分比.
|
948
|
949
|
businessDeliveryStorageNoticeV.setCompleteRate(completeRate.stripTrailingZeros().toPlainString());
|
949
|
|
- businessDeliveryStorageNoticeV.setSysl(businessScedule.getSumSysl());
|
|
950
|
+ BigDecimal sumSsysl = new BigDecimal(businessScedule.getSumSysl()).divide(s).setScale(3, BigDecimal.ROUND_DOWN);
|
|
951
|
+ businessDeliveryStorageNoticeV.setSysl(sumSsysl.toString());
|
950
|
952
|
}
|
951
|
953
|
// 在出入库list中删除该数据,这样下次循环数量就会减少了.
|
952
|
954
|
businessSceduleList.remove(businessScedule);
|
|
@@ -959,6 +961,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
|
959
|
961
|
// 进行到这里,说明出入库系统中,不存在该通知单对应的出入库数据. 设置完成数量,和完成比例为0.
|
960
|
962
|
businessDeliveryStorageNoticeV.setCompleteAmount("0");
|
961
|
963
|
businessDeliveryStorageNoticeV.setCompleteRate("0");
|
|
964
|
+ businessDeliveryStorageNoticeV.setSysl("0");
|
962
|
965
|
}
|
963
|
966
|
}
|
964
|
967
|
} else {
|