备货查询名称，修改订单导入

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java

@@ -264,5 +264,11 @@ public class DistributionReservationEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 操作人
+	 */
+	@ApiModelProperty(value = "操作人")
+	@TableField(exist = false)
+	private String operator ;
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -59,7 +59,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String trainNumber;
 	//备货区名称
 	private String stockupArea;
-
+	//客户名称
 	private String consignee;
 	private String deliveryAddress;
 	private String deliveryPhone;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -40,9 +40,10 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -66,7 +67,7 @@ public class DistributionReservationController extends BladeController {
 
 	private final IDistributionReservationService reservationService;
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
-
+	private final IUserClient userClient;
 
 	/**
 	 * 预约列表 详情
@@ -103,6 +104,11 @@ public class DistributionReservationController extends BladeController {
 			lambda.notIn(DistributionReservationEntity::getId,ids);
 		}
 		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query),lambda );
+		pages.getRecords().forEach(i ->{
+			R<User> userR = userClient.userInfoById(i.getCreateUser());
+			i.setOperator(userR.getData().getName());
+		});
+
 		return R.data(DistributionReservationWrapper.build().pageVO(pages));
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java

@@ -16,6 +16,7 @@ public class BillLadingAppDTO implements Serializable {
 
 	private String pickUpTimeStart;//提货时间开始
 	private String pickUpTimeEnd;//提货时间结束
+	private String conditions;//提货时间结束
 
 	private Integer orderStatus;//订单状态
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -784,6 +784,15 @@
             <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
                 and ldsa.warehouse_id = #{paramMap.warehouseId}
             </if>
+
+            <if test="paramMap.waybillNumber != null and paramMap.waybillNumber != ''">  and ldpl.waybill_number = #{paramMap.waybillNumber}  </if>
+            <if test="paramMap.orderCode != null and paramMap.orderCode != ''">  and ldsa.order_code = #{paramMap.orderCode}  </if>
+            <if test="paramMap.mallName != null and paramMap.mallName != ''">  and ldsa.mall_name = #{paramMap.mallName}  </if>
+            <if test="paramMap.typeService != null and paramMap.typeService != ''">  and ldsa.type_service = #{paramMap.typeService}  </if>
+            <if test="paramMap.consigneeUnit != null and paramMap.consigneeUnit != ''">  and ldsa.consignee_unit = #{paramMap.consigneeUnit}  </if>
+            <if test="paramMap.trainNumber != null and paramMap.trainNumber != ''">  and ldsa.train_number = #{paramMap.trainNumber}  </if>
+            <if test="paramMap.acceptWarehouseName != null and paramMap.acceptWarehouseName != ''">  and ldsa.accept_warehouse_name = #{paramMap.acceptWarehouseName}  </if>
+
             <if test="paramMap.tenantId != null and paramMap.tenantId != ''">
                 and ldsa.tenant_id = #{paramMap.tenantId}
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -334,11 +334,11 @@
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
         COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')stockipAllocation,
         COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet,
-        COALESCE(GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ','), '') consignee
+        COALESCE(group_concat(DISTINCT ldsa.mall_name separator ','), '') as consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
-        LEFT JOIN logpm_distribution_reservation ldr on ldsi.reservation_id = ldr.id
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
+        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldbs.order_status in (1,2)
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -235,11 +235,12 @@
         lad.stock_article_id stockArticleId
         from logpm_distrilbution_bill_lading lad
         <where>
-            lad.is_deleted = 0 and lad.conditions = 10
-            <!-- and lad.warehouse_id = #{param.warehouseId} -->
+            lad.is_deleted = 0
+            and lad.warehouse_id = #{param.warehouseId}
             <if test="param.pickUpTimeStart != null and param.pickUpTimeStart!='' ">and lad.pick_up_time between
                 #{param.pickUpTimeStart} and #{param.pickUpTimeEnd}
             </if>
+        <if test="param.conditions != null and param.conditions != ''" >and lad.conditions =#{ param.conditions }</if>
 
         </where>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -290,8 +290,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		distributionStockupEntity.setTenantId(AuthUtil.getTenantId());
 		if (distributionStockupEntity.getTypeService().equals("3")) {
+			//自
 			return baseMapper.pageOweList(page, distributionStockupEntity);
 		} else {
+			//商  市
 			return baseMapper.pageList(page, distributionStockupEntity);
 		}