|
|
@@ -733,13 +733,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if (StringUtils.isNull(tWarehouseBills.getfCorpid())) {
|
|
|
return AjaxResult.error("库存明细第" + i + "行请检查客户信息，操作终止");
|
|
|
}
|
|
|
- long fCorpid = tWarehouseBills.getfCorpid();
|
|
|
+ /*long fCorpid = tWarehouseBills.getfCorpid();
|
|
|
TGoods tGoods = tGoodsMapper.selectTGoodsById(wbItem.getfGoodsid());
|
|
|
long fGoodsid = tGoods.getfTypeid();
|
|
|
long fBillingway = wbItem.getfBillingway();
|
|
|
long fQty = wbItem.getfQty();
|
|
|
// 计算仓储费明细
|
|
|
- Map<String, Object> objectMap = tWarehouseAgreementService.getCarryingCost(fCorpid, fGoodsid, dateDay, fBillingway, fQty);
|
|
|
+ Map<String, Object> objectMap = tWarehouseAgreementService.getCarryingCost(fCorpid, fGoodsid, dateDay, fBillingway, fQty , 0L);
|
|
|
if (StringUtils.isNull(objectMap)) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("库存明细第" + i + "行没有维护出库明细的仓储协议，操作终止");
|
|
|
@@ -761,7 +761,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
fees.setfExrate(new BigDecimal(1));
|
|
|
fees.setfCurrency("RMB");
|
|
|
fees.setRemark(dateDay + "天" + tFees.getfName());
|
|
|
- warehousebillsfees.add(fees);
|
|
|
+ warehousebillsfees.add(fees);*/
|
|
|
}
|
|
|
} else if ("CKDB".equals(billsType)) { // 调拨查询
|
|
|
if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存
|
maxianghua