diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java
index 0d4e39bcb..286041c9a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java
@@ -20,6 +20,8 @@ import com.logpm.distribution.entity.DistributionReservationPackageEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.util.Date;
+
/**
* 预约包件中间表 数据传输对象实体类
*
@@ -31,4 +33,19 @@ import lombok.EqualsAndHashCode;
public class DistributionReservationPackageDTO extends DistributionReservationPackageEntity {
private static final long serialVersionUID = 1L;
private Long warehouseId;
+ private String waybillNumber;
+ private String serviceNumber;
+ private String orderCode;
+ private String warehouseName;
+ private String orderPackageCode;
+ private String sendWarehouseName;
+ private String acceptWarehouseName;
+ private Date reservationDate;
+ private String trainNumber;
+ private String firsts;
+ private String second;
+ private String thirdProduct;
+ private String materialName;
+ private String trayCode;
+ private String positionCode;
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java
index 215c246d4..1222ed8e0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java
@@ -31,4 +31,14 @@ import lombok.EqualsAndHashCode;
public class DistributionReservationStockarticleDTO extends DistributionReservationStockarticleEntity {
private static final long serialVersionUID = 1L;
+ private String waybillNumber;
+ private String orderCode;
+ private String mallName;
+ private String storeName;
+ private String descriptionGoods;
+ private String brand;
+ private String consigneeUnit;
+ private String resource;
+ private String deliveryType;
+
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java
index bb1ef3b67..e2326c0ac 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java
@@ -30,5 +30,16 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
public class DistributionReservationStocklistDTO extends DistributionReservationStocklistEntity {
private static final long serialVersionUID = 1L;
+ private String incomingBatch;
+ private String orderCode;
+ private String sku;
+ private String marketName;
+ private String cargoNumber;
+ private String cargoUnit;
+ private String descriptionGoods;
+ private String brandName;
+ private String trayCode;
+ private String positionCode;
+ private String stockupArea;
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java
index 9173bcf28..ebd7f0a0a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java
@@ -53,7 +53,7 @@ public class DistributionReservationPackageExcel implements Serializable {
*/
@ColumnWidth(20)
@ExcelProperty("预约时间")
- private Date reservation_date;
+ private Date reservationDate;
/**
* 订单编号
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java
index d8a88307a..3e9953e3e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java
@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
@@ -40,65 +41,132 @@ public class DistributionReservationStocklistExcel implements Serializable {
private static final long serialVersionUID = 1L;
+
/**
- * 租户号
+ * 预约编号
*/
@ColumnWidth(20)
- @ExcelProperty("租户号")
- private String tenantId;
+ @ExcelProperty("预约编号")
+ private String reservationCode;
/**
- * 是否已删除
+ * 包件编号
*/
@ColumnWidth(20)
- @ExcelProperty("是否已删除")
- private Integer isDeleted;
+ @ExcelProperty("预约时间")
+ private Date reservationDate;
+
/**
- * 预约编号
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("预约编号")
- private String reservationId;
+ @ExcelProperty("服务类型")
+ private String deliveryType;
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("收货人")
+ private String consignee;
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("手机号码")
+ private String deliveryPhone;
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("收货地址")
+ private String deliveryAddress;
+
+// /**
+// * 订单编号
+// */
+// @ColumnWidth(20)
+// @ExcelProperty("服务号")
+// private String serviceNumber;
+
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("订单自编号")
+ private String orderCode;
+
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("SKU")
+ private String sku;
/**
- * 库存编号
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("库存编号")
- private String stocklistId;
+ @ExcelProperty("商场名称")
+ private String marketName;
/**
- * 预约数量
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("物料编码")
+ private String cargoNumber;
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("单位")
+ private String cargoUnit;
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("物料名称")
+ private String descriptionGoods;
+ /**
+ * 订单编号
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("品牌")
+ private String brandName;
+
+ /**
+ * 订单编号
*/
@ColumnWidth(20)
@ExcelProperty("预约数量")
private String reservationNum;
/**
- * 预留1
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("预留1")
- private String reserve1;
+ @ExcelProperty("备货数量")
+ private String stockNumber;
/**
- * 预留2
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("预留2")
- private String reserve2;
+ @ExcelProperty("已备件数")
+ private String realityNum;
/**
- * 预留3
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("预留3")
- private String reserve3;
+ @ExcelProperty("备货区")
+ private String stockupArea;
/**
- * 预留4
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("预留4")
- private String reserve4;
+ @ExcelProperty("托盘码")
+ private String trayCode;
/**
- * 预留5
+ * 订单编号
*/
@ColumnWidth(20)
- @ExcelProperty("预留5")
- private String reserve5;
+ @ExcelProperty("库位信息")
+ private String positionCode;
+
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
index 83d2829a1..862a81983 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
@@ -59,13 +59,21 @@
ldrp.packet_bar_status in (1,3)
and ldrs.reservation_id = #{param.reservationId }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
+ and ldpl.waybill_number like concat('%',#{param.waybillNumber },'%')
+ and ldpl.service_number like concat('%', #{param.serviceNumber },'%')
+ and ldpl.order_code like concat('%', #{param.orderCode },'%')
+ and ldr.warehouse_name like concat('%', #{param.warehouseName },'%')
+ and ldpl.order_package_code like concat('%', #{param.orderPackageCode },'%')
+ and ldpl.send_warehouse_name like concat('%', #{param.sendWarehouseName },'%')
+ and ldpl.accept_warehouse_name like concat('%', #{param.acceptWarehouseName },'%')
+ and date_format(ldr.reservation_date,'%Y-%m-%d') = #{param.reservationDate}
+ and ldpl.train_number like concat('%', #{param.trainNumber },'%')
+ and ldpl.firsts like concat('%', #{param.firsts },'%')
+ and ldpl.second like concat('%', #{param.second } ,'%')
+ and ldpl.third_product like concat('%', #{param.thirdProduct } ,'%')
+ and ldpl.material_name like concat('%', #{param.materialName },'%')
+ and lwtg.tray_code like concat('%',#{param.trayCode },'%')
+ and lwug.position_code like concat('%', #{param.positionCode } ,'%')
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java
index e9a649931..2d725a81f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java
@@ -19,6 +19,7 @@ package com.logpm.distribution.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionReservationStockarticleDTO;
import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
import com.logpm.distribution.excel.DistributionReservationStockarticleExcel;
import com.logpm.distribution.vo.DistributionReservationStockarticleVO;
@@ -52,7 +53,7 @@ public interface DistributionReservationStockarticleMapper extends BaseMapper exportDistributionReservationStockarticle(@Param("ew") Wrapper queryWrapper);
+ List exportDistributionReservationStockarticle(@Param("param") DistributionReservationStockarticleDTO queryWrapper);
/**
* 物理删除预约订单中间表
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml
index 439b49c95..6b52e664a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml
@@ -58,14 +58,15 @@
ldrs.stock_article_status in (1,3)
and ldrs.reservation_id = #{param.reservationId }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
- and = #{param. }
+ and ldsa.waybill_number like concat('%',#{param.waybillNumber },'%')
+ and ldsa.order_code like concat('%', #{param.orderCode },'%')
+ and ldsa.mall_name like concat('%', #{param.mallName },'%')
+ and ldsa.store_name like concat('%', #{param.storeName },'%')
+ and ldsa.description_goods like concat('%', #{param.descriptionGoods },'%')
+ and ldsa.brand like concat('%', #{param.brand },'%')
+ and ldsa.consignee_unit like concat('%', #{param.consigneeUnit },'%')
+ and ldsa.resource like concat('%',#{param.resource },'%')
+ and ldr.delivery_type = #{param.deliveryType}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml
index c949da644..1c1c9fb5f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml
@@ -35,7 +35,32 @@