预约查看订单包件过滤库存品包件

blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java

@@ -66,7 +66,7 @@ public class FileUtil extends TimerTask {
 		switch (type) {
 			case "photo_1":
 				//上门
-				imgPath += "\\doorr";
+				imgPath += "\\door";
 				break;
 			case "photo_2":
 				imgPath += "\\stacking";

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

@@ -1218,6 +1218,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public IPage<DistributionParcelListVO> getPackageListByStockArticleId(IPage<DistributionParcelListVO> page, Long orderId) {
 		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, orderId)
 			.eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
+			.ne(DistributionParcelListEntity::getConditions, 2)
 			.notIn(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue(), OrderPackageStatusConstant.yichuku.getValue()));
 		List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 		return page.setRecords(parcelListVOS);