永发1.调箱成本接口调试及修改

  2.费用请核接口调试及修改
  3.修改5.9日禅道bug

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/ExpenseApplication.java

@@ -160,6 +160,12 @@ public class ExpenseApplication implements Serializable {
 	private String pageLabel;
 
 	/**
+	 * 业务日期
+	 */
+	@TableField(exist = false)
+	private List<String> srcBusDateList;
+
+	/**
 	 * 审核路径
 	 */
 	@TableField(exist = false)

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/TradingBox.java

@@ -141,7 +141,7 @@ public class TradingBox implements Serializable {
 	private Integer status;
 	/**
 	 * 类别（BUY：买箱 、SELL：卖箱、ZR：租入、ZC：租出、DL：代理箱、
-	 * OW-N：OW拿箱、OW-F：OW放箱、XGFY：箱管费用、XGDX：箱管调箱、CCSQ：出场申请）
+	 * OW-N：OW拿箱、OW-F：OW放箱、XGFY：箱管费用、XGDX：箱管调箱、CCSQ：出场申请、DXCB：调箱成本）
 	 */
 	@ApiModelProperty(value = "类别")
 	private String type;

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/BoxAdjustmentCostController.java

@@ -34,6 +34,8 @@ import org.springblade.los.box.vo.BoxAdjustmentCostVO;
 import org.springblade.los.box.service.IBoxAdjustmentCostService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  * 调箱成本 控制器
  *
@@ -111,6 +113,16 @@ public class BoxAdjustmentCostController extends BladeController {
 		return boxAdjustmentCostService.submit(boxAdjustmentCost);
 	}
 
+	/**
+	 * 新增或修改 调箱成本
+	 */
+	@PostMapping("/submitList")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入boxAdjustmentCost")
+	public R submitList(@Valid @RequestBody List<BoxAdjustmentCost> boxAdjustmentCostList) {
+		return boxAdjustmentCostService.submitList(boxAdjustmentCostList);
+	}
+
 
 	/**
 	 * 删除 调箱成本

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/ExpenseApplicationController.java

@@ -16,6 +16,8 @@
  */
 package org.springblade.los.box.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,8 +27,10 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.business.sea.entity.Bills;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.box.entity.ExpenseApplication;
@@ -66,7 +70,21 @@ public class ExpenseApplicationController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入expenseApplication")
 	public R<IPage<ExpenseApplication>> list(ExpenseApplication expenseApplication, Query query) {
-		IPage<ExpenseApplication> pages = expenseApplicationService.page(Condition.getPage(query), Condition.getQueryWrapper(expenseApplication));
+		LambdaQueryWrapper<ExpenseApplication> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(ExpenseApplication::getTenantId, AuthUtil.getTenantId())
+			.eq(ExpenseApplication::getIsDeleted,0)
+			.eq(ObjectUtils.isNotNull(expenseApplication.getSrcType()),ExpenseApplication::getSrcType,expenseApplication.getSrcType())
+			.like(ObjectUtils.isNotNull(expenseApplication.getSrcMblno()),ExpenseApplication::getSrcMblno,expenseApplication.getSrcMblno())
+			.like(ObjectUtils.isNotNull(expenseApplication.getSrcContainerNumber()),ExpenseApplication::getSrcContainerNumber,expenseApplication.getSrcContainerNumber())
+			.like(ObjectUtils.isNotNull(expenseApplication.getSrcContractNo()),ExpenseApplication::getSrcContractNo,expenseApplication.getSrcContractNo())
+			.like(ObjectUtils.isNotNull(expenseApplication.getSrcNo()),ExpenseApplication::getSrcNo,expenseApplication.getSrcNo())
+			.eq(ObjectUtils.isNotNull(expenseApplication.getCorpCnName()),ExpenseApplication::getCorpCnName,expenseApplication.getCorpCnName())
+			.orderByDesc(ExpenseApplication::getSrcBusDate);
+		if (ObjectUtils.isNotNull(expenseApplication.getSrcBusDateList()) && !expenseApplication.getSrcBusDateList().isEmpty()){
+			lambdaQueryWrapper.ge(ExpenseApplication::getSrcBusDate, expenseApplication.getSrcBusDateList().get(0));
+			lambdaQueryWrapper.le(ExpenseApplication::getSrcBusDate, expenseApplication.getSrcBusDateList().get(1));
+		}
+		IPage<ExpenseApplication> pages = expenseApplicationService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/RouteCostController.java

@@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -100,9 +101,12 @@ public class RouteCostController extends BladeController {
 				.like(RouteCost::getShippingCompanyEname, routeCost.getShippingCompanyCname()).or().like(RouteCost::getShippingCompanyCode, routeCost.getShippingCompanyCname()))
 			.and(ObjectUtils.isNotNull(routeCost.getShipCname()), i -> i.like(RouteCost::getShipCname, routeCost.getShipCname()).or()
 				.like(RouteCost::getShipEname, routeCost.getShipCname()).or().like(RouteCost::getShipCode, routeCost.getShipCname()))
-			.like(ObjectUtils.isNotNull(routeCost.getVoyage()), RouteCost::getVoyage, routeCost.getVoyage())
-			.gt(ObjectUtils.isNotNull(routeCost.getExistStationDay()), RouteCost::getExistStationDay, routeCost.getExistStationDay())
-			.lt(ObjectUtils.isNotNull(routeCost.getEffectiveEndDate()), RouteCost::getEffectiveEndDate, routeCost.getEffectiveEndDate());
+			.like(ObjectUtils.isNotNull(routeCost.getVoyage()), RouteCost::getVoyage, routeCost.getVoyage());
+		if (ObjectUtils.isNotNull(routeCost.getEffectiveStartDate()) && ObjectUtils.isNotNull(routeCost.getEffectiveEndDate())) {
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+			lambdaQueryWrapper.apply(ObjectUtils.isNotNull(routeCost.getEffectiveStartDate()), "DATE_FORMAT(effective_date,'%Y-%m-%d') >= '" + formatter.format(routeCost.getEffectiveStartDate()) + "'")
+				.apply(ObjectUtils.isNotNull(routeCost.getEffectiveEndDate()), "DATE_FORMAT(expiry_date,'%Y-%m-%d') <= '" + formatter.format(routeCost.getEffectiveEndDate()) + "'");
+		}
 		if ("0".equals(routeCost.getSort())) {
 			lambdaQueryWrapper.orderByAsc(RouteCost::getTotalProfit);
 		} else if ("1".equals(routeCost.getSort())) {

blade-service/blade-los/src/main/java/org/springblade/los/box/service/IBoxAdjustmentCostService.java

@@ -22,6 +22,8 @@ import org.springblade.los.box.vo.BoxAdjustmentCostVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 调箱成本 服务类
  *
@@ -42,4 +44,6 @@ public interface IBoxAdjustmentCostService extends IService<BoxAdjustmentCost> {
 	R submit(BoxAdjustmentCost boxAdjustmentCost);
 
     BoxAdjustmentCost detail(BoxAdjustmentCost boxAdjustmentCost);
+
+	R submitList(List<BoxAdjustmentCost> boxAdjustmentCostList);
 }

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/BoxAdjustmentCostServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 调箱成本 服务实现类
@@ -44,7 +45,6 @@ public class BoxAdjustmentCostServiceImpl extends ServiceImpl<BoxAdjustmentCostM
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public R submit(BoxAdjustmentCost boxAdjustmentCost) {
 		if (boxAdjustmentCost.getId() == null) {
 			boxAdjustmentCost.setCreateTime(new Date());
@@ -65,4 +65,23 @@ public class BoxAdjustmentCostServiceImpl extends ServiceImpl<BoxAdjustmentCostM
 		return baseMapper.selectById(boxAdjustmentCost.getId());
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R submitList(List<BoxAdjustmentCost> boxAdjustmentCostList) {
+		for (BoxAdjustmentCost boxAdjustmentCost : boxAdjustmentCostList) {
+			if (boxAdjustmentCost.getId() == null) {
+				boxAdjustmentCost.setCreateTime(new Date());
+				boxAdjustmentCost.setCreateUser(AuthUtil.getUserId());
+				boxAdjustmentCost.setCreateUserName(AuthUtil.getUserName());
+				boxAdjustmentCost.setTenantId(AuthUtil.getTenantId());
+			} else {
+				boxAdjustmentCost.setUpdateUser(AuthUtil.getUserId());
+				boxAdjustmentCost.setUpdateTime(new Date());
+				boxAdjustmentCost.setUpdateUserName(AuthUtil.getUserName());
+			}
+		}
+		this.saveOrUpdateBatch(boxAdjustmentCostList);
+		return R.data(boxAdjustmentCostList);
+	}
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/ExpenseApplicationServiceImpl.java

@@ -86,7 +86,7 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 		LambdaQueryWrapper<FeeCenter> feeCenterLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		feeCenterLambdaQueryWrapper.eq(FeeCenter::getIsDeleted, 0)
 			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-			.eq(FeeCenter::getPid, details.getId());
+			.eq(FeeCenter::getStlPid, details.getId());
 		List<FeeCenter> feeCenterList = feeCenterService.list(feeCenterLambdaQueryWrapper);
 		details.setFeeCenterList(feeCenterList.isEmpty() ? new ArrayList<>() : feeCenterList);
 		return details;

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/PutBoxServiceImpl.java

@@ -720,9 +720,12 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 						archives.setContainerNumberOw(item.getContainerNumber());
 						archives.setContainerNumberTypeOw("OW(放)");
 					}
-					if (!archives.getBoxType().equals(item.getBoxType())) {
+					if (!archives.getTypeName().equals(item.getBoxType())) {
 						throw new RemoteException("箱号：" + item.getBoxCode() + "与箱档案中箱型不符");
 					}
+					if ("使用中".equals(archives.getStatus())) {
+						throw new RemoteException("箱号：" + item.getBoxCode() + "状态为使用中");
+					}
 					archives.setUpdateTime(new Date());
 					archives.setUpdateUser(AuthUtil.getUserId());
 					archives.setUpdateUserName(AuthUtil.getUserName());

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/TradingBoxServiceImpl.java

@@ -510,11 +510,13 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			for (BoxAdjustmentCost item : tradingBox.getBoxAdjustmentCostList()) {
 				if (item.getId() == null) {
 					item.setCreateUser(AuthUtil.getUserId());
+					item.setCreateUserName(AuthUtil.getUserName());
 					item.setCreateTime(new Date());
 					item.setTenantId(AuthUtil.getTenantId());
 					item.setPid(tradingBox.getId());
 				} else {
 					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateUserName(AuthUtil.getUserName());
 					item.setUpdateTime(new Date());
 					item.setPid(tradingBox.getId());
 				}
@@ -2070,6 +2072,11 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		if (putBoxItemsList.isEmpty()) {
 			throw new RuntimeException("未查到需计算租金明细");
 		}
+		List<FeeCenter> feeCenters = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+			.eq(FeeCenter::getIsDeleted, 0)
+			.eq(FeeCenter::getPid, detail.getId())
+		);
 		List<RentTerm> rentTermList = rentTermService.list(new LambdaQueryWrapper<RentTerm>()
 			.eq(RentTerm::getIsDeleted, 0)
 			.eq(RentTerm::getTenantId, AuthUtil.getTenantId())
@@ -2110,7 +2117,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			feeCenter.setFeeCode(fees.getCode());
 			feeCenter.setFeeCnName(fees.getCnName());
 			feeCenter.setFeeEnName(fees.getEnName());
-			feeCenter.setCurCode(fees.getCurNo());
+			feeCenter.setCurCode(rentTermList.get(0).getCurCode());
 			feeCenter.setCntrNo(item.getCode());
 			feeCenter.setUnitNo(item.getBoxType());
 			if (ObjectUtils.isNotNull(item.getPodEmptyContainerReturnDate())
@@ -2133,12 +2140,15 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				feeCenter.setDays(Integer.parseInt(duration.toDays() + "") + 1);
 			}
 			Integer days = feeCenter.getDays();
-			Instant instant3 = item.getRentEndDate().toInstant();
-			Instant instant4 = item.getPolStationEmptyContainerExitDate().toInstant();
-			LocalDate date3 = instant3.atZone(ZoneId.systemDefault()).toLocalDate();
-			LocalDate date4 = instant4.atZone(ZoneId.systemDefault()).toLocalDate();
-			Duration duratio1 = Duration.between(date4.atStartOfDay(), date3.atStartOfDay());
-			int earlySumDays = Integer.parseInt(duratio1.toDays() + "");
+			int earlySumDays = 0;
+			if (item.getRentEndDate().compareTo(item.getPolStationEmptyContainerExitDate()) != 0) {
+				Instant instant3 = item.getRentEndDate().toInstant();
+				Instant instant4 = item.getPolStationEmptyContainerExitDate().toInstant();
+				LocalDate date3 = instant3.atZone(ZoneId.systemDefault()).toLocalDate();
+				LocalDate date4 = instant4.atZone(ZoneId.systemDefault()).toLocalDate();
+				Duration duratio1 = Duration.between(date4.atStartOfDay(), date3.atStartOfDay());
+				earlySumDays = Integer.parseInt(duratio1.toDays() + "") + 1;
+			}
 			String text = "";
 			int dayLength;
 			BigDecimal amount = new BigDecimal("0.00");
@@ -2170,11 +2180,12 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			}
 			if ("CNY".equals(feeCenter.getCurCode())) {
 				feeCenter.setExrate(new BigDecimal("1.00"));
+				feeCenter.setAmount(amount);
 			} else {
 				feeCenter.setExrate(exrateC);
+				feeCenter.setAmountLoc(amount);
 			}
 			feeCenter.setPrice(amount);
-			feeCenter.setAmount(amount);
 			feeCenter.setRemarks(text);
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setOutboundDate(tradingBox.getRentDate());
@@ -2199,6 +2210,44 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		tradingBoxItemService.updateBatchById(putBoxItemsList);
 		if (!feeCenterList.isEmpty()) {
 			feeCenterService.saveBatch(feeCenterList);
+			if (!feeCenters.isEmpty()) {
+				feeCenters.addAll(feeCenterList);
+			} else {
+				feeCenters = feeCenterList;
+			}
+			BigDecimal exrateD = bCurrencyService.getCnyExrate(new Date(), "USD", "D", "1");
+			//费用数据
+			BigDecimal amountD = new BigDecimal("0.00");
+			BigDecimal amountC = new BigDecimal("0.00");
+			BigDecimal amountDUsd = new BigDecimal("0.00");
+			BigDecimal amountCUsd = new BigDecimal("0.00");
+			for (FeeCenter item : feeCenters) {
+				if ("CNY".equals(item.getCurCode())) {
+					if ("D".equals(item.getDc())) {
+						amountD = amountD.add(item.getAmount());
+					} else {
+						amountC = amountC.add(item.getAmount());
+					}
+				} else {
+					if ("D".equals(item.getDc())) {
+						amountDUsd = amountDUsd.add(item.getAmountLoc());
+					} else {
+						amountCUsd = amountCUsd.add(item.getAmountLoc());
+					}
+				}
+			}
+			tradingBox.setAmountD(amountD);
+			tradingBox.setAmountDUsd(amountDUsd);
+			BigDecimal totalAmountD = amountD.add(amountDUsd.multiply(exrateD));
+			tradingBox.setTotalAmountD(totalAmountD);
+			tradingBox.setAmountC(amountC);
+			tradingBox.setAmountCUsd(amountCUsd);
+			BigDecimal totalAmountC = amountC.add(amountCUsd.multiply(exrateC));
+			tradingBox.setTotalAmountC(totalAmountC);
+			tradingBox.setProfit(tradingBox.getAmountD().subtract(tradingBox.getAmountC()));
+			tradingBox.setProfitUsd(tradingBox.getAmountDUsd().subtract(tradingBox.getAmountCUsd()));
+			tradingBox.setTotalProfit(tradingBox.getTotalAmountD().subtract(tradingBox.getTotalAmountC()));
+			baseMapper.updateById(tradingBox);
 		}
 		return R.data(tradingBox);
 	}
@@ -2219,13 +2268,17 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		tradingBoxFeesLambdaQueryWrapper.eq(FeeCenter::getIsDeleted, 0)
 			.eq(FeeCenter::getPid, tradingBox.getId())
 			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-			.eq(FeeCenter::getFeeCode, "BOX-ZJ")
 			.orderByDesc(FeeCenter::getCreateTime);
-		List<FeeCenter> feeCenters = feeCenterService.list(tradingBoxFeesLambdaQueryWrapper);
+		List<FeeCenter> feeCentersList = feeCenterService.list(tradingBoxFeesLambdaQueryWrapper);
+		if (feeCentersList.isEmpty()) {
+			throw new RuntimeException("未查到费用明细");
+		}
+		List<FeeCenter> feeCenters = feeCentersList.stream().filter(e-> e.getFeeCode().equals("BOX-ZJ")).collect(Collectors.toList());
 		if (feeCenters.isEmpty()) {
 			throw new RuntimeException("未计算过租金，撤销失败");
 		}
 		List<TradingBoxItem> itemList = new ArrayList<>();
+		List<Long> feeId = new ArrayList<>();
 		for (TradingBoxItem item : tradingBoxItemList) {
 			List<FeeCenter> feeCenterList = feeCenters.stream().filter(e -> e.getCntrNo().equals(item.getCode())).collect(Collectors.toList());
 			if (!feeCenterList.isEmpty()) {
@@ -2234,6 +2287,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					throw new RuntimeException("箱型：" + item.getBoxType() + "费用已生成账单，撤销失败");
 				}
 				feeCenterService.removeById(feeCenter.getId());
+				feeId.add(feeCenter.getId());
 				item.setUpdateTime(new Date());
 				item.setUpdateUser(AuthUtil.getUserId());
 				item.setUpdateUserName(AuthUtil.getUserName());
@@ -2252,6 +2306,43 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		if (!itemList.isEmpty()) {
 			tradingBoxItemService.updateBatchById(itemList);
 		}
+		if (!feeId.isEmpty()){
+			List<FeeCenter> feeCenterList = feeCentersList.stream().filter(e-> !feeId.contains(e.getId())).collect(Collectors.toList());
+			BigDecimal exrateD = bCurrencyService.getCnyExrate(new Date(), "USD", "D", "1");
+			BigDecimal exrateC = bCurrencyService.getCnyExrate(new Date(), "USD", "C", "1");
+			//费用数据
+			BigDecimal amountD = new BigDecimal("0.00");
+			BigDecimal amountC = new BigDecimal("0.00");
+			BigDecimal amountDUsd = new BigDecimal("0.00");
+			BigDecimal amountCUsd = new BigDecimal("0.00");
+			for (FeeCenter item : feeCenterList) {
+				if ("CNY".equals(item.getCurCode())) {
+					if ("D".equals(item.getDc())) {
+						amountD = amountD.add(item.getAmount());
+					} else {
+						amountC = amountC.add(item.getAmount());
+					}
+				} else {
+					if ("D".equals(item.getDc())) {
+						amountDUsd = amountDUsd.add(item.getAmountLoc());
+					} else {
+						amountCUsd = amountCUsd.add(item.getAmountLoc());
+					}
+				}
+			}
+			tradingBox.setAmountD(amountD);
+			tradingBox.setAmountDUsd(amountDUsd);
+			BigDecimal totalAmountD = amountD.add(amountDUsd.multiply(exrateD));
+			tradingBox.setTotalAmountD(totalAmountD);
+			tradingBox.setAmountC(amountC);
+			tradingBox.setAmountCUsd(amountCUsd);
+			BigDecimal totalAmountC = amountC.add(amountCUsd.multiply(exrateC));
+			tradingBox.setTotalAmountC(totalAmountC);
+			tradingBox.setProfit(tradingBox.getAmountD().subtract(tradingBox.getAmountC()));
+			tradingBox.setProfitUsd(tradingBox.getAmountDUsd().subtract(tradingBox.getAmountCUsd()));
+			tradingBox.setTotalProfit(tradingBox.getTotalAmountD().subtract(tradingBox.getTotalAmountC()));
+			baseMapper.updateById(tradingBox);
+		}
 		tradingBox.setTradingBoxItemsList(tradingBoxItemList);
 		return R.data(tradingBox);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -688,9 +688,6 @@ public class BillsController extends BladeController {
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
 			.eq(ObjectUtils.isNotNull(bills.getIssueType()), Bills::getIssueType, bills.getIssueType())
-//			.and(ObjectUtils.isNotNull(bills.getHconsigneeCnName()), i -> i.like(Bills::getHconsigneeCnName, bills.getHconsigneeCnName()).or()
-//				.like(Bills::getHconsigneeCode, bills.getHconsigneeCnName()).or().like(Bills::getHconsigneeEnName, bills.getHconsigneeCnName()))
-
 			.eq(ObjectUtils.isNotNull(bills.getBillType()), Bills::getBillType, bills.getBillType())
 			.eq(ObjectUtils.isNotNull(bills.getBusinessType()), Bills::getBusinessType, bills.getBusinessType())
 			.eq(ObjectUtils.isNotNull(bills.getSeaType()), Bills::getSeaType, bills.getSeaType())