Merge branch 'dev' into pre-production

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

@@ -101,7 +101,7 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
 	 * @param stockListDTO
 	 * @return
 	 */
-	List<DistributionStockListVO> selectAllStockList(@Param("par")DistributionStockListDTO stockListDTO);
+	IPage<DistributionStockListVO> selectAllStockList(@Param("par")DistributionStockListDTO stockListDTO, IPage<DistributionStockListVO> page);
 
 	/**
 	 * 查询库存平数据

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

@@ -533,7 +533,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionSignfor.setExamineUserName(user.getNickName());
 		this.updatePicture(distributionSignforDTO);
 		this.updateById(distributionSignfor);
-
+		//修改预约单的签收状态和装车状态
+		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
+		reservationEntity.setId(distributionSignfor.getReservationId());
+		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
+		reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());;
+        distributionReservationService.updateById(reservationEntity);
 		distributionAsyncService.sendReviewFactory(distributionSignforDTO.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getId());
 		//还需要对未装车未签收的包件进行状态的回退
 		boolean flag = this.judgmentSignIsHavePackage(distributionSignfor.getReservationId());

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

@@ -649,9 +649,10 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		}
 		DistributionStockListDTO stockListDTO = Func.copy(distributionStockList, DistributionStockListDTO.class);
 		stockListDTO.setWarehouseId(myCurrentWarehouse.getId());
-		List<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO);
-		page.setRecords(stockListVOList);
-		return page;
+		IPage<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO,page);
+//		List<DistributionStockListVO> stockListVOList = baseMapper.selectAllStockList(stockListDTO,page);
+//		page.setRecords(stockListVOList);
+		return stockListVOList;
 	}
 
 	/**