|
|
@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.ruoyi.approvalFlow.domain.AuditItems;
|
|
|
-import com.ruoyi.approvalFlow.mapper.AuditItemsDoMapper;
|
|
|
import com.ruoyi.approvalFlow.mapper.AuditItemsMapper;
|
|
|
import com.ruoyi.approvalFlow.mapper.AuditItemsUsersMapper;
|
|
|
import com.ruoyi.approvalFlow.service.impl.AuditItemsAbout;
|
|
|
@@ -68,7 +67,6 @@ import com.ruoyi.warehouseBusiness.mapper.*;
|
|
|
import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.apache.poi.hssf.usermodel.*;
|
|
|
-import org.apache.poi.ss.formula.functions.T;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
import org.apache.poi.ss.util.CellRangeAddress;
|
|
|
import org.apache.poi.ss.util.CellReference;
|
|
|
@@ -5057,7 +5055,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
storageFeesDto.setfNetweight(new BigDecimal(String.valueOf(item.get("fNetweight"))));
|
|
|
storageFeesDto.setfGrossweight(new BigDecimal(String.valueOf(item.get("fGrossweight"))));
|
|
|
// 计算仓储费明细
|
|
|
- StorageFeeCalculationResultVO carryingCost = tWarehouseAgreementService.getCarryingCost(storageFeesDto);
|
|
|
+ StorageFeeCalculationResultVO carryingCost = null;
|
|
|
+ try {
|
|
|
+ carryingCost = tWarehouseAgreementService.getCarryingCost(storageFeesDto);
|
|
|
+ } catch (StorageFeeException e) {
|
|
|
+ throw new WarehouseException("编号" + e.getMessage() + "未找到计费规则");
|
|
|
+ }
|
|
|
if (StringUtils.isNull(carryingCost)) {
|
|
|
continue;
|
|
|
}
|
sunhz