包件明细导出修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionParcelListExcel.java

@@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -40,21 +41,95 @@ public class DistributionParcelListExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
+
 	@ColumnWidth(20)
-	@ExcelProperty("仓库")
+	@ExcelProperty("运单号")
-	private String warehouse;
+	private String waybillNumber;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 
 	@ColumnWidth(20)
 	@ExcelProperty("包条码")
 	private String orderPackageCode;
 
 	@ColumnWidth(20)
-	@ExcelProperty("货位信息")
+	@ExcelProperty("仓库")
-	private String goodsAllocation;
+	private String warehouse;
+
 
 	@ColumnWidth(20)
-	@ExcelProperty("所在托盘")
+	@ExcelProperty("服务类型")
-	private String pallet;
+	private String typeService;
+
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("入库时间")
+	private String warehouseEntryTimeEnd;
+
+	@ColumnWidth(20)
+	@ExcelProperty("包件类型")
+	private String conditions;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货状态")
+	private String orderPackageStockupStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("包件状态")
+	private String orderPackageStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("装车状态")
+	private String orderPackageLoadingStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("预约状态")
+	private String orderPackageReservationStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("上架状态")
+	private String orderPackageGroundingStatus;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("任务号")
+	private String reservationCode;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("配送司机")
+	private String driverName;
+
+	@ColumnWidth(20)
+	@ExcelProperty("装车时间")
+	private String loadingTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("实际装车人")
+	private String scanUser;
+
+	@ColumnWidth(20)
+	@ExcelProperty("签收时间")
+	private String signingTime;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("实际签收人")
+	private String signingUser;
+
+	@ColumnWidth(20)
+	@ExcelProperty("车次号")
+	private String trainNumber;
+
+	@ColumnWidth(20)
+	@ExcelProperty("配送车辆")
+	private String vehicleName;
 
 	@ColumnWidth(20)
 	@ExcelProperty("一级品")
@@ -69,18 +144,70 @@ public class DistributionParcelListExcel implements Serializable {
 	private String thirdProduct;
 
 	@ColumnWidth(20)
-	@ExcelProperty("上架状态")
+	@ExcelProperty("物料编码")
-	private String orderPackageGroundingStatus;
+	private String materialCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private String materialName;
+
+
+
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("货位信息")
+	private String goodsAllocation;
+
+	@ColumnWidth(20)
+	@ExcelProperty("所在托盘")
+	private String pallet;
 
 	@ColumnWidth(20)
 	@ExcelProperty("数量")
 	private String quantity;
 
-	@ColumnWidth(20)
+
-	@ExcelProperty("车次号")
+
-	private String trainNumber;
+
+
+//	@ColumnWidth(20)
+//	@ExcelProperty("冻结状态")
+//	private String orderPackageFreezeStatus;
+
+
+
+
+
+
+
+
+
+
+
+//
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务号")
+//	private String serviceNumber;
+
+
+
+
 
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号")
+	@ExcelProperty("品牌名称")
-	private String orderCode;
+	private String brandName;
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

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

@@ -888,7 +888,11 @@
         ldpl.warehouse_id warehouseId,
         ldpl.id id,
         lww.name warehouse,
-        ldpl.conditions conditions,
+        CASE  ldpl.conditions
+        WHEN 1 THEN '订制品'
+        WHEN 2 THEN '库存品'
+        WHEN 3 THEN '零担'
+        END conditions,
         ldpl.order_package_code orderPackageCode,
         ldpl.firsts firsts,
         ldpl.second second,
@@ -915,7 +919,7 @@
         IF(c.reservation_code is not null,c.reservation_code,IF(b.pickup_batch is not null,b.pickup_batch,a.reservation_code)) AS reservationCode,
         IF(c.driver_name is not null,c.driver_name,IF(b.consignee is not null,b.consignee,a.driver_name)) AS driverName,
         IF(c.vehicle_name is not null,c.vehicle_name,IF(b.pick_up_plate is not null,b.pick_up_plate,a.vehicle_name)) AS vehicleName,
-        IF(c.train_number is not null,c.train_number,IF(b.train_number is not null,b.train_number,a.train_number)) AS dvehicleName,
+        IF(c.train_number is not null,c.train_number,IF(b.train_number is not null,b.train_number,a.train_number)) AS trainNumber,
         IF(c.scan_user is not null,c.scan_user,IF(b.scan_user is not null,b.scan_user,a.scan_user)) AS scanUser,
         IF(c.signing_user is not null,c.signing_user,IF(b.signing_user is not null,b.signing_user,a.signing_user)) AS signingUser,
         IF(c.scan_time is not null,c.scan_time,IF(b.scan_time is not null,b.scan_time,a.scan_time)) AS loadingTime,

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

@@ -700,6 +700,12 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		List<DistributionParcelListExcel> list = baseMapper.exportDistributionParcelList(paramMap, idArr);
 		list.forEach(li -> {
 			li.setOrderPackageGroundingStatus(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, li.getOrderPackageGroundingStatus()));
+			li.setOrderPackageStatus(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, li.getOrderPackageStatus()));
+			li.setOrderPackageReservationStatus(DictBizCache.getValue(DictBizConstant.ORDER_RESERVATION_STATUS, li.getOrderPackageReservationStatus()));
+//			li.setOrderPackageFreezeStatus(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, li.getOrderPackageFreezeStatus()));
+			li.setOrderPackageStockupStatus(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, li.getOrderPackageStockupStatus()));
+			li.setOrderPackageLoadingStatus(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, li.getOrderPackageLoadingStatus()));
+			li.setTypeService(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, li.getTypeService()));
 		});
 		return list;
 	}