|
@@ -1148,7 +1148,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
long dateDay = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fChargedate"));
|
|
|
long fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
|
|
|
Long dictLabel = Long.valueOf(String.valueOf(item.get("fBillingway")));
|
|
|
- BigDecimal fQty = this.acquiredQuantity(item, dictLabel);
|
|
|
+ BigDecimal fQty = acquiredQuantity(item, dictLabel);
|
|
|
if (fQty.equals(BigDecimal.ZERO)) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("单号:" + item.get("fBillno") + ",业务日期:" + item.get("fBsdate") + "未找到计费单位,请确认");
|
|
@@ -1164,7 +1164,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
BigDecimal amt = (BigDecimal) objectMap.get("amt");
|
|
|
map.put("feeId", feeId);
|
|
|
map.put("itemFeeId", objectMap.get("feeId"));
|
|
|
- sumAmt = sumAmt.add(amt);
|
|
|
+ sumAmt = sumAmt.add(amt).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
|
|
|
tWarehousebillsitems.setfAmt(amt);
|
|
|
tWarehousebillsitems.setfBillstatus(50L);
|
|
@@ -1435,13 +1435,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
} else if (dictLabel.equals(grossWeight)) {
|
|
|
fQty = new BigDecimal(((Number) item.get("fGrossweight")).doubleValue());
|
|
|
} else if (dictLabel.equals(netWeight)) {
|
|
|
- fQty = new BigDecimal(((Number) item.get("fNetweight")).doubleValue());
|
|
|
} else if (dictLabel.equals(size)) {
|
|
|
+ fQty = new BigDecimal(((Number) item.get("fNetweight")).doubleValue());
|
|
|
fQty = new BigDecimal(((Number) item.get("fVolumn")).doubleValue());
|
|
|
} else if (dictLabel.equals(fixed)) {
|
|
|
fQty = new BigDecimal(1);
|
|
|
}
|
|
|
- return fQty;
|
|
|
+ return fQty.setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
|
|
|
// 入库 收费明细 校验
|