整托装车BUG修复

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

@@ -180,6 +180,7 @@ public class DistributionParcelListController extends BladeController  {
 	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
 	public R<IPage<DistributionParcelListVO>> page(DistributionParcelListVO distributionParcelList, Query query) {
 		IPage<DistributionParcelListVO> pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList);
+
 		return R.data(DistributionParcelListVOWrapper.build().pageVO(pages));
 	}
 

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

@@ -962,6 +962,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										BladeUser user = AuthUtil.getUser();
 //										loadscanEntity.setScanUser(user.getUserName());
 										loadscanEntity.setScanUser(user.getNickName());
+										loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
+										loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
 										loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 										loadscanEntity.setOneClick(1);
 										loadscanEntity.setScanType("2");