1.bug修复

blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java

@@ -28,7 +28,7 @@ public class ReportPackgeStartTimeVO implements Serializable {
 
 	@ExcelProperty(value = "未发运件数")
 	private Integer noOutNum;
-	@ExcelProperty(value = "为发运超时件数")
+	@ExcelProperty(value = "未发运超时件数")
 	private Integer noOutOverNum;
 
 	@ExcelProperty(value = "准时发运件数")

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -11648,11 +11648,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//判断包件是否已入库
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 		if (!Objects.isNull(distributionParcelListEntity)) {
-			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
-			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
-				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-				return Resp.scanFail(200,"包件已入库", "包件已入库");
-			}
+//			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
+//			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
+//				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+//				return Resp.scanFail(200,"包件已入库", "包件已入库");
+//			}
+			log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return Resp.scanFail(200,"包件已入库", "包件已入库");
 		}