Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/CorpsDescExportExcel.java

@@ -83,7 +83,8 @@ public class CorpsDescExportExcel implements Serializable {
 	 * 信用额度
 	 */
 	@ExcelProperty(value = "信用额度")
-	private BigDecimal creditLimit;
+	// private BigDecimal creditLimit;
+	private BigDecimal limitAmount;
 
 	/**
 	 * 使用信用额度

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -129,6 +129,8 @@ public class OrderController extends BladeController {
 			.like(ObjectUtils.isNotEmpty(order.getRefno()), PjOrder::getRefno, order.getRefno())//参考号
 			.like(ObjectUtils.isNotEmpty(order.getGoodsNameJoin()), PjOrder::getGoodsNameJoin, order.getGoodsNameJoin())//来源单号
 			.like(ObjectUtils.isNotEmpty(order.getBusinessSource()), PjOrder::getBusinessSource, order.getBusinessSource())//来源
+			// 资金方
+			.like(StringUtil.isNotBlank(order.getFundingPartyName()), PjOrder::getFundingPartyName, order.getFundingPartyName())
 		// zh状态
 			.eq(StringUtil.isNotBlank(order.getWhetherRedeem()), PjOrder::getWhetherRedeem, order.getWhetherRedeem());
 		if (order.getDueDateList() != null && order.getDueDateList().size() > 1) {//应结日期

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/controller/SharePutOnShelvesController.java

@@ -40,6 +40,7 @@ import org.springblade.salesPart.excel.ShareTheNextDayDataExcel;
 import org.springblade.salesPart.share.entity.SharePutOnShelves;
 import org.springblade.salesPart.share.service.ISharePutOnShelvesService;
 import org.springblade.salesPart.share.vo.SharePutOnShelvesVO;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -97,6 +98,8 @@ public class SharePutOnShelvesController extends BladeController {
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getGoodsDescription()), SharePutOnShelves::getGoodsDescription, sharePutOnShelves.getGoodsDescription())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getPlaceProduction()), SharePutOnShelves::getPlaceProduction, sharePutOnShelves.getPlaceProduction())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getBrandName()), SharePutOnShelves::getBrandName, sharePutOnShelves.getBrandName())
+			.like(StringUtils.hasText(sharePutOnShelves.getBrandItem()), SharePutOnShelves::getBrandItem, sharePutOnShelves.getBrandItem())
+			.like(StringUtils.hasText(sharePutOnShelves.getSpecificationAndModel()), SharePutOnShelves::getSpecificationAndModel, sharePutOnShelves.getSpecificationAndModel())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getBrandId()), SharePutOnShelves::getBrandId, sharePutOnShelves.getBrandId())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getSrcSalesCompanyName()), SharePutOnShelves::getSrcSalesCompanyName, sharePutOnShelves.getSrcSalesCompanyName())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getSharedCompany()), SharePutOnShelves::getSharedCompany, sharePutOnShelves.getSharedCompany())

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/controller/ShipController.java

@@ -47,6 +47,7 @@ import org.springblade.salesPart.ship.service.IShipService;
 import org.springblade.salesPart.vo.ShipVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -116,6 +117,7 @@ public class ShipController extends BladeController {
 			.eq(ObjectUtil.isNotEmpty(ship.getStockClerkId()), PjShip::getStockClerkId, ship.getStockClerkId())//库管
 			.eq(ObjectUtil.isNotEmpty(ship.getBsType()), PjShip::getBsType, ship.getBsType())//库管
 			.like(ObjectUtil.isNotEmpty(ship.getCustomerName()), PjShip::getCustomerName, ship.getCustomerName())
+			.like(StringUtils.hasText(ship.getSalesCompanyName()), PjShip::getSalesCompanyName, ship.getSalesCompanyName())
 			//单据类型
 			.apply(ObjectUtil.isNotEmpty(ship.getBizTypeName()), "find_in_set(biz_type_name,'" + ship.getBizTypeName() + "')");