修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IStorageClient.java

@@ -22,9 +22,17 @@ import java.util.Map;
 public interface IStorageClient {
 	String API_PREFIX = "/client";
 	String FIND_BY_ID = API_PREFIX + "/findById";
+	String STORAGE_MESSAGE = API_PREFIX + "/storageMessage";
 
     @GetMapping(FIND_BY_ID)
 	StorageDesc findById(@RequestParam(value = "id",required = true) Long id);
 
+	/**
+	 * 根据仓库id获取仓库信息回显
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(STORAGE_MESSAGE)
+	List<Map<String,Object>> getStorageMessage(@RequestParam(value = "id",required = true) Long id);
 
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -339,5 +339,10 @@ public class Delivery implements Serializable {
 	private String storageName;
 	@TableField(exist = false)
 	@ApiModelProperty(value = "仓库中文名")
-	private Map<Object,Object> storageMap;
+	private List<Map<String,Object>> storageMap;
+	/**
+	 * 提单号
+	 */
+	@ApiModelProperty(value = "提单号")
+	private String billNo;
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/mapper/StorageDescMapper.java

@@ -22,6 +22,7 @@ import org.springblade.client.vo.StorageDescVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 库区表 Mapper 接口
@@ -56,4 +57,11 @@ public interface StorageDescMapper extends BaseMapper<StorageDesc> {
 	 */
 	StorageDesc selectStorageDescCname(@Param("cname") String cname,
 									  @Param("tenantId") String tenantId);
+
+	/**
+	 * 根据仓库id获取仓库信息回想中文
+	 * @param id
+	 * @return
+	 */
+	List<Map<String,Object>> getStorageMessage(@Param("id") Long id);
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/mapper/StorageDescMapper.xml

@@ -95,5 +95,8 @@
     <select id="selectStorageDescCname" resultMap="storageDescResultMap">
         select id,cname from basic_storage_desc where is_deleted = 0 and cname =#{cname} and tenant_id = #{tenantId}
     </select>
+    <select id="getStorageMessage" resultType="java.util.Map">
+        select id,cname from basic_storage_desc where id = #{id}
+    </select>
 
 </mapper>

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/IStorageDescService.java

@@ -16,11 +16,15 @@
  */
 package org.springblade.client.serial.service;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.vo.StorageDescVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 库区表 服务类
  *
@@ -64,4 +68,11 @@ public interface IStorageDescService extends IService<StorageDesc> {
 	 * @return
 	 */
 	String selectStorageDescCname(StorageDesc storageDesc);
+
+	/**
+	 * 获取仓库信息回显
+	 * @param id
+	 * @return
+	 */
+	List<Map<String,Object>> getStorageMessage(Long id);
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/StorageDescServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 库区表 服务实现类
@@ -115,4 +116,9 @@ public class StorageDescServiceImpl extends ServiceImpl<StorageDescMapper, Stora
 		}
 	}
 
+	@Override
+	public List<Map<String, Object>> getStorageMessage(Long id) {
+		return baseMapper.getStorageMessage(id);
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/storage/feign/StorageClient.java

@@ -40,6 +40,11 @@ public class StorageClient implements IStorageClient {
 		return  storageDescService.getById(id);
 	}
 
+	@GetMapping(STORAGE_MESSAGE)
+	@Override
+	public List<Map<String, Object>> getStorageMessage(Long id) {
+		return storageDescService.getStorageMessage(id);
+	}
 
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -101,6 +101,7 @@ public class DeliveryController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().forEach(item ->{

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -99,6 +99,7 @@ public class ExportDeliveryController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().forEach(item ->{

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -102,6 +102,9 @@ public class ImportDeliveryController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()),Delivery::getBillNo,delivery.getBillNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()),Delivery::getOrderNo,delivery.getOrderNo());//合同号
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().forEach(item ->{

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ExportReCeVingController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.deliver.goods.receiving;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -78,11 +79,27 @@ public class ExportReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		delivery.setIsDeleted(0);
-		delivery.setTenantId(SecureUtil.getTenantId());
-		delivery.setBillType(OrderTypeEnum.RECEIPT.getType());
-		delivery.setTradeType(OrderTypeEnum.EXPORT.getType());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), Condition.getQueryWrapper(delivery));
+		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.RECEIPT.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.EXPORT.getType());
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()),Delivery::getBillNo,delivery.getBillNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()),Delivery::getOrderNo,delivery.getOrderNo());//合同号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrgOrderNo()),Delivery::getOrgOrderNo,delivery.getOrgOrderNo());//销售订单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getSrcOrderNo()),Delivery::getSrcOrderNo,delivery.getSrcOrderNo());//采购订单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCorpId()),Delivery::getCorpId,delivery.getCorpId());//客户
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalAddress()),Delivery::getArrivalAddress,delivery.getArrivalAddress());//收货地址
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalContact()),Delivery::getArrivalContact,delivery.getArrivalContact());//收货人
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getCreateStartTime()),Delivery::getCreateTime,delivery.getCreateStartTime());//制单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateEndTime());//制单日期结束
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//收货日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessEndDate());//收货日期结束
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题
 		List<Delivery> records = pages.getRecords();
 		if(CollectionUtils.isNotEmpty(records))

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ImportReCeVingController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.deliver.goods.receiving;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -78,11 +79,25 @@ public class ImportReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		delivery.setIsDeleted(0);
-		delivery.setTenantId(SecureUtil.getTenantId());
-		delivery.setBillType(OrderTypeEnum.RECEIPT.getType());
-		delivery.setTradeType(OrderTypeEnum.IMPORT.getType());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), Condition.getQueryWrapper(delivery));
+		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.RECEIPT.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.IMPORT.getType());
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()),Delivery::getBillNo,delivery.getBillNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()),Delivery::getOrderNo,delivery.getOrderNo());//合同号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCorpId()),Delivery::getCorpId,delivery.getCorpId());//客户
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalAddress()),Delivery::getArrivalAddress,delivery.getArrivalAddress());//收货地址
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalContact()),Delivery::getArrivalContact,delivery.getArrivalContact());//收货人
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getCreateStartTime()),Delivery::getCreateTime,delivery.getCreateStartTime());//制单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateEndTime());//制单日期结束
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//收货日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessEndDate());//收货日期结束
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题
 		List<Delivery> records = pages.getRecords();
 		if(CollectionUtils.isNotEmpty(records))

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ReCeVingController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.deliver.goods.receiving;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -82,13 +83,27 @@ public class ReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		QueryWrapper<Delivery> queryWrapper = Condition.getQueryWrapper(delivery);
-		queryWrapper.eq("bill_type","SH")
-		.eq("trade_type","GN")
-		.eq("tenant_id", AuthUtil.getTenantId())
-		.between(StringUtils.isNotBlank(delivery.getCreateStartTime())&&StringUtils.isNotBlank(delivery.getCreateEndTime()),"create_time",delivery.getCreateStartTime(),delivery.getCreateEndTime())
-		.between(StringUtils.isNotBlank(delivery.getBusinessStartDate())&&StringUtils.isNotBlank(delivery.getBusinessEndDate()),"business_date",delivery.getBusinessStartDate(),delivery.getBusinessEndDate());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), queryWrapper);
+		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.RECEIPT.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DOMESTIC.getType());
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()),Delivery::getBillNo,delivery.getBillNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()),Delivery::getOrderNo,delivery.getOrderNo());//合同号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrgOrderNo()),Delivery::getOrgOrderNo,delivery.getOrgOrderNo());//销售订单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getSrcOrderNo()),Delivery::getSrcOrderNo,delivery.getSrcOrderNo());//采购订单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCorpId()),Delivery::getCorpId,delivery.getCorpId());//客户
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalAddress()),Delivery::getArrivalAddress,delivery.getArrivalAddress());//收货地址
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalContact()),Delivery::getArrivalContact,delivery.getArrivalContact());//收货人
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getCreateStartTime()),Delivery::getCreateTime,delivery.getCreateStartTime());//制单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateEndTime());//制单日期结束
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//收货日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessEndDate());//收货日期结束
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题
 		List<Delivery> records = pages.getRecords();
 		if(CollectionUtils.isNotEmpty(records))

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -51,10 +51,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 发货通知单 服务实现类
@@ -159,15 +156,9 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 		//获取仓库信息
 		if (selectById.getStorageId() != null){
-			Map<Object,Object> map = new HashMap<>();
 			//仓库信息
-			StorageDesc storageDesc = iStorageClient.findById(selectById.getStorageId());
-			if(storageDesc!=null)
-			{
-				map.put(selectById.getStorageId(),storageDesc.getCname());
-				selectById.setStorageName(storageDesc.getCname());
-			}
-			selectById.setStorageMap(map);
+			List<Map<String, Object>> storageMessage = iStorageClient.getStorageMessage(selectById.getStorageId());
+			selectById.setStorageMap(storageMessage);
 		}
 		//获取发货明细表数据
 		List<DeliveryItems> deliveryItemsList = deliveryItemsService.getDeliveryItems(delivery);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -132,6 +132,7 @@ public class OrderController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPortOfDestination()),Order::getPortOfDestination,order.getPortOfDestination());//目的港
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()), Order::getPlannedDeliveryDate,order.getPlannedDeliveryStart());//计划交货开始
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()), Order::getPlannedDeliveryDate,order.getPlannedDeliveryEnd());//计划交货结束
+		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()),Order::getOrderRemark,order.getOrderRemark());//备注
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entrance/EntranceOrderController.java

@@ -113,12 +113,16 @@ public class EntranceOrderController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getCreateTimeEnd()),Order::getCreateTime,order.getCreateTimeEnd());//制单日期结束
 		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getDateValidityStart()),Order::getDateValidity,order.getDateValidityStart());//有效日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getDateValidityEnd()),Order::getDateValidity,order.getDateValidityEnd());//有效日期结束
-		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getOrderStartDate()),Order::getBusinesDate,order.getOrderStartDate());//订单日期开始
-		lambdaQueryWrapper.le(Func.isNotEmpty(order.getOrderEndDate()),Order::getBusinesDate,order.getOrderEndDate());//订单日期结束
+		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getOrderStartDate()),Order::getAdvanceCollectionDate,order.getOrderStartDate());//首付日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(order.getOrderEndDate()),Order::getAdvanceCollectionDate,order.getOrderEndDate());//首付日期结束
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPortOfLoad()),Order::getPortOfLoad,order.getPortOfLoad());//装货港
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPortOfDestination()),Order::getPortOfDestination,order.getPortOfDestination());//目的港
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()), Order::getPlannedDeliveryDate,order.getPlannedDeliveryStart());//计划交货开始
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()), Order::getPlannedDeliveryDate,order.getPlannedDeliveryEnd());//计划交货结束
+		lambdaQueryWrapper.like(Func.isNotEmpty(order.getBillNo()),Order::getBillNo,order.getBillNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()),Order::getOrderRemark,order.getOrderRemark());//备注
+		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderAmount()),Order::getOrderAmount,order.getOrderAmount());//合同金额
+		lambdaQueryWrapper.like(Func.isNotEmpty(order.getSalesName()),Order::getSalesName,order.getSalesName());//业务员
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -109,6 +109,7 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPortOfDestination()),Order::getPortOfDestination,order.getPortOfDestination());//目的港
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()), Order::getPlannedDeliveryDate,order.getPlannedDeliveryStart());//计划交货开始
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()), Order::getPlannedDeliveryDate,order.getPlannedDeliveryEnd());//计划交货结束
+		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()),Order::getOrderRemark,order.getOrderRemark());//备注
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -75,13 +75,13 @@
     <select id="gainUser" resultType="map">
          SELECT
             id,
-            account
+            name
         FROM
             blade_user
         WHERE
             tenant_id = #{param1}
             and is_deleted = 0
-            AND account IS NOT NULL
+            AND name IS NOT NULL
     </select>
 
 </mapper>