Merge branch 'dev' into pre-production

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCustomerMallEntity.java

@@ -35,19 +35,19 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class AftersalesCustomerMallEntity extends TenantEntity {
 	/**
-	 *
+	 *客服ID
 	 */
 	private Long customerServiceId;
 	/**
-	 *
+	 *商场ID
 	 */
 	private Long clientId;
 	/**
-	 *
+	 *客服名称
 	 */
 	private String customerServiceName;
 	/**
-	 *
+	 *商场名称
 	 */
 	private String clientName;
 	/**

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java

@@ -207,10 +207,5 @@ public class BasicdataCarrierEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
-	/**
-	 * id
-	 */
-	@ApiModelProperty(value = "id")
-	private Long id;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java

@@ -319,6 +319,4 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
-	@ApiModelProperty(value = "id")
-	private Long id;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java

@@ -281,9 +281,4 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	private Integer oldId;
 
 
-	/**
-	 *   对应id
-	 */
-	@ApiModelProperty(value = "仓库id")
-	public Long id;
 }

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

@@ -451,16 +451,16 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "配载件数")
 	private Integer carsLoadNum;
 	/**
-	 * 未入库数量
+/*	 * 未入库数量
-	 */
+	 *//*
 	@TableField(exist = false)
 	private Integer unreceivedQuantity;
-	/**
+	*//**
 	 * 创建用户id和时间
-	 */
+	 *//*
 	@TableField(exist = false)
 	private Long createUser;
 	@TableField(exist = false)
 	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
+	private Date createTime;*/
 }

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

@@ -159,6 +159,8 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	@ApiModelProperty(value = "ids")
 	private List<Long> clientIds;
 
+	private Integer unreceivedQuantity;
+
 
 
 	public Map<String, Object> toMap() throws IllegalAccessException {

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

@@ -41,6 +41,9 @@ public class DistributionStockupStockListVO implements Serializable {
 	private Integer unpack;//是否拆包 0 没有 1 拆了
 	private String sourceType;//是否拆包 1 订单 2导入
 
+
+
+
 	// 货位ID 集合
 	private String allocations;
 

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

@@ -0,0 +1,49 @@
+package com.logpm.distribution.vo.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DistributionAppPackageDetailVO implements Serializable {
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderCode;
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String orderPackageCode;
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private Integer isLoading;
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private Integer type;
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private Integer isSignfor;
+
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private Integer isAbnormal;
+
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java

@@ -295,4 +295,16 @@ public class DistributionSignforAppController {
 		}
 	}
 
+	/**
+	 * 查询签收包件列表
+	 * @param reservationId
+	 * @return
+	 */
+	@GetMapping("/signingPackageDetail")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "查询签收包件列表" )
+	public R signingPackageDetail(@RequestParam Long reservationId) {
+		return  distributionSignforService.signingPackageDetail(reservationId);
+	}
+
 }

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

@@ -275,6 +275,23 @@ public class DistrilbutionBillLadingController extends BladeController {
 		return R.status(distrilbutionBillLadingService.ownSaveOrUpdate(distrilbutionBillLading));
 	}
 
+
+
+	/**
+	 * 提货单 上传签收图片
+	 */
+	@PostMapping("/signImages")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "上传签收图片", notes = "传入distrilbutionBillLading")
+	public R signImages(@Valid @RequestBody DistrilbutionBillLadingDTO distrilbutionBillLading) {
+		if(ObjectUtil.isEmpty(distrilbutionBillLading.getZeroType())){
+			return R.fail(3003,"零担判断参数不能为空！！");
+		}
+		return R.status(distrilbutionBillLadingService.signImages(distrilbutionBillLading));
+	}
+
+
+
 	/**
 	 * 提货单 删除
 	 */

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

@@ -70,7 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionStockupOrderListVO> selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 
     List<DistributionStockupStockListVO> selectStockupStockList(@Param("reservationId")Long reservationId);
-    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId);
+    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId") Long warehouseId);
 
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 

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

@@ -317,8 +317,8 @@
         (SELECT SUM(aldrs.reality_num) FROM logpm_distribution_reservation_stocklist AS aldrs WHERE aldrs.reservation_id = #{reservationId} AND aldrs.stocklist_id in (t.aaa)) AS realNum,
         (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} AND newldrs.stocklist_id in (t.aaa)) AS planNum,
         (
-        select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
+        select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number and warehouse_id=#{warehouseId} or association_value in (
-        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number)
+        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number and warehouse_id=#{warehouseId} )
         ) as allocations
         FROM
         (

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

@@ -25,10 +25,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionSignforEntity;
 import com.logpm.distribution.excel.DistributionSignforExcel;
 import com.logpm.distribution.vo.*;
-import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO;
+import com.logpm.distribution.vo.app.*;
-import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
-import com.logpm.distribution.vo.app.DistributionAppSignforVO;
-import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
 import com.logpm.oldproject.dto.SignPushDataUnitDTO;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.secure.BladeUser;
@@ -309,4 +306,11 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
     DistributionSignforEntity selectByDeliveryIdAndMallName(@Param("reservationId")Long deliveryId,@Param("mallName") String mallName);
+
+	/**
+	 * PDA查询签收列表详情
+	 * @param reservationId
+	 * @return
+	 */
+	List<DistributionAppPackageDetailVO> signingPackageDetail(@Param("reservationId") Long reservationId);
 }

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

@@ -1230,4 +1230,53 @@
             resultType="com.logpm.distribution.entity.DistributionSignforEntity">
         SELECT * FROM  logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId} AND ldr.mall_mame = #{mallName}
     </select>
+    <select id="signingPackageDetail"
+            resultType="com.logpm.distribution.vo.app.DistributionAppPackageDetailVO">
+        SELECT
+        ldpl.order_code  AS orderCode,
+        ldpl.order_package_code  AS orderPackageCode,
+        1  AS type,
+        IF(ldl.id is  null,0,1)  AS isLoading,
+        IF(ldl.id is  null or ldl.signfor_state = 1,0,1)  AS isSignfor,
+        0  AS isAbnormal
+        FROM
+        logpm_distribution_reservation AS ldr
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1
+        WHERE
+        ldrp.packet_bar_status != 2
+        AND ldr.id = #{reservationId}
+        UNION
+        SELECT
+        ldpl.order_code  AS orderCode,
+        ldpl.order_package_code  AS orderPackageCode,
+        1 AS type,
+        1 AS isLoading,
+        IF(ldl.id is not null AND ldl.signfor_state = 2,0,1)  AS isSignfor,
+        1 AS isAbnormal
+        FROM
+        logpm_distribution_loadscan AS ldl
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id
+        WHERE
+        ldl.reservation_id = #{reservationId} AND ldl.is_abnormal_loading = 2 AND ldl.scan_status != 1
+        UNION
+        SELECT
+        ldsl.order_code  AS orderCode,
+        ldsld.stock_package_code  AS orderPackageCode,
+        2 AS type,
+        IF
+        ( ldll.id IS NULL, 0, 1 ) AS isLoading,
+        IF(ldll.id is  null or ldll.signfor_state = 1,0,1)  AS isSignfor,
+        0 AS isAbnormal
+        FROM
+        logpm_distribution_reservation AS ldr
+        LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsl.id = ldrs.stocklist_id
+        LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldr.id = ldsld.reservation_id AND ldsld.stock_list_id = ldrs.stocklist_id
+        LEFT JOIN logpm_distribution_loadscaninvn As ldll ON ldll.inventory_package_id = ldsld.id AND ldll.scan_status != 1
+        WHERE
+        ldr.id = #{reservationId}
+
+    </select>
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 
 	List<DistributionStockupOrderListVO> selectStockupOrderList(Long reservationId,String isZero);
 
-	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId);
+	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId);
 
     Integer selectOrderNumByReservationId(Long reservationId);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -272,4 +272,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	R signforackPC(DistributionSignforDTO distributionSignfor);
+
+
+	R signingPackageDetail(Long reservationId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java

@@ -212,4 +212,6 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	 * @return
 	 */
 	R getReceivedImage(BillLadingAppDTO billLadingAppDTO);
+
+	boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading);
 }

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

@@ -3049,6 +3049,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								//没有进行包件选择  默认添加可配送的所有包件
 								//添加订单下的所有在库订单的包件
 								List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()).ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue()).ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue()).notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()}));
+								if (Func.isEmpty(distributionParcelListEntities)) {
+									log.error("##############添加空订单");
+									throw new RuntimeException(s.getOrderCode()+"无可用包件!!!");
+								}
 								distributionParcelListEntities.forEach(dp -> {
 									if (!dp.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
 										if (!Func.equals(dp.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(dp.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) {
@@ -3141,13 +3145,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							List<DistributionParcelListDTO> packageListInfo = s.getPackageListInfo();
 							log.info("reservationEntity.getId()>>>>>>>>{}", reservationEntity.getId());
 							log.info("s.getId()>>>>>>>>{}", s.getId());
-							List<DistributionReservationPackageEntity> list = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda().eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()).eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, "2"));
+							List<DistributionReservationPackageEntity> list = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+								.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
+								.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
+								.ne(DistributionReservationPackageEntity::getPacketBarStatus, "2"));
 //							List<DistributionReservationPackageEntity> distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper<DistributionReservationPackageEntity>().lambda()
 //								.eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId())
 //								.eq(DistributionReservationPackageEntity::getStockArticleId, s.getId())
 //							);
 							if (Func.isEmpty(list)) {
 								log.error("###########################预约包件查询错误:{}", list);
+								log.error("###########################查询错误预约Id:{}", reservationEntity.getId());
 								throw new RuntimeException("服务器正忙...");
 							}
 							Map<Long, List<DistributionReservationPackageEntity>> oldPackageList = list.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId));

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

@@ -2863,8 +2863,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId) {
+	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId) {
-		return baseMapper.selectStockupStockListNew(reservationId);
+		return baseMapper.selectStockupStockListNew(reservationId,warehouseId);
 	}
 
 	@Override

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

@@ -752,6 +752,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return R.status(update);
 	}
 
+	@Override
+	public R signingPackageDetail(Long reservationId) {
+		List<DistributionAppPackageDetailVO> details = baseMapper.signingPackageDetail(reservationId);
+		return R.data(details);
+	}
+
 	private boolean judgmentSignIsHavePackage(Long reservationId) {
 		boolean flag = false;
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);

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

@@ -1135,7 +1135,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public List<DistributionStockupStockListVO> selectStockupStockList(StockupDTO stockupDTO) {
+
+
 		Long reservationId = stockupDTO.getReservationId();//预约单id
+		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+
 		if (stockupDTO.getTypeService().equals("3")) {
 			//自
 			List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupSelf(reservationId);
@@ -1163,7 +1167,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 
 			//商，市
-			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
+			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId,reservationEntity.getWarehouseId());
 			for (int i = 0; i < list.size(); i++) {
 				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
 				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {

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

@@ -191,7 +191,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distrilbutionBillPackageService.update(updateWrapper1);
 				}
 			}catch (Exception e){
-				log.info("自提取消订单报错！{}",e.getMessage());
+				log.error("自提取消订单报错！{}",e.getMessage());
 				throw new ServiceException("系统异常！！");
 			}
 
@@ -316,7 +316,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				if (!order) {
 					throw new ServiceException("修改失败！！");
 				}
-			}else{
+			}
+		/*	else{
 				updateOrder(distrilbutionBillLading);
 			}
 			if(distrilbutionBillLading.getStockArticleList().isEmpty() && distrilbutionBillLading.getStockDTOList().isEmpty()){
@@ -325,7 +326,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				updateStockBill(distrilbutionBillLading);
 				//取消自提任务
 				baseMapper.deleteById(billLadingEntity.getId());
-			}
+			}*/
 			//修改库存品
 			if (!distrilbutionBillLading.getStockDTOList().isEmpty()) {
 				//全部库存品数据
@@ -560,7 +561,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						if(i > 0){
 							//部分
 							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
-						}else if(1 == 0){
+						}else if(i == 0){
 							//全部
 							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 						}
@@ -618,6 +619,32 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return true;
 	}
 
+
+	@Override
+	public boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading) {
+
+
+		//修改图片
+		List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId()));
+		if (!printEntityList.isEmpty()) {
+			if (distrilbutionBillLading.getMark()) {
+				//要删除
+				List<Long> collect = printEntityList.stream().map(DistributionPrintEntity::getId).collect(Collectors.toList());
+				distributionPrintService.deleteLogic(collect);
+				//操作图片
+				if (!distrilbutionBillLading.getPrintList().isEmpty()) {
+					addPrint(distrilbutionBillLading);
+				}
+			}
+		}else{
+			//操作图片
+			if (!distrilbutionBillLading.getPrintList().isEmpty()) {
+				addPrint(distrilbutionBillLading);
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * 自提没有包件信息添加包件
 	 * @param stockArticleId

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml

@@ -13,7 +13,7 @@
 
     <select id="selectEntityByOrderPackageCode" resultType="com.logpm.factory.oupai.entity.FactoryOrderEntity">
         SELECT
-        *
+        ofo.*
         FROM
         op_factory_order ofo
         LEFT JOIN op_factory_package ofp ON ofo.id = ofp.order_id

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -105,4 +105,6 @@ public class DistributionDatarepair {
 
 
 
+
+
 }