Merge branch 'dev' into pre-production

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

@@ -196,4 +196,5 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
     List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus);
 
+
 }

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

@@ -212,4 +212,11 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 */
     UpDownStockupAreaVO findUpDownStockupZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId);
 
+	/**
+	 * 查询订单配送信息
+	 * @param type
+	 * @param code
+	 * @return
+	 */
+    R getOrderDeliveryInfo(Integer type, String code);
 }

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

@@ -55,6 +55,8 @@ import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusCon
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
+import org.springblade.common.constant.reservation.ReservationOrderStatusConstant;
+import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.FileUtil;
@@ -126,6 +128,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionParcelNumberMapper distributionParcelNumberMapper;
 	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
+	private final IDistributionReservationPackageService distributionReservationPackageService;
 	private final IUserClient userClient;
 
 	@Override
@@ -1588,6 +1591,42 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return baseMapper.findUpDownStockupZeroByOrderCodeAndWarehouseId(orderCode,warehouseId);
 	}
 
+	/**
+	 * @param type
+	 * @param code
+	 * @return
+	 */
+	@Override
+	public R getOrderDeliveryInfo(Integer type, String code) {
+		switch (type){
+			//运单
+			case 1:
+				List<DistributionStockArticleEntity> list = this.list(Wrappers.<DistributionStockArticleEntity>query().lambda().eq(DistributionStockArticleEntity::getOrderCode, code));
+				if (Func.isNotEmpty(list) && list.size()>0){
+					//查询配送数量
+					for (DistributionStockArticleEntity stockArticleEntity : list) {
+						//查询配送数量
+						List<DistributionReservationPackageEntity> packageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+							.eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId())
+							.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
+						);
+						if (Func.isNotEmpty(packageEntityList)){
+							long count = packageEntityList.stream().count();
+
+						}
+						//查询签收数量
+					}
+				}
+				break;
+			case 2:
+				break;
+			default:
+				return R.fail("查无此信息");
+			//订单
+		}
+		return null;
+	}
+
 
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {

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

@@ -231,7 +231,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			//选择的
 			//查询客户是不是有该物资的拆包
 			one2 = this.getOne(Wrappers.<DistributionStockListEntity>query().lambda()
-				.eq(DistributionStockListEntity::getMaterialId, distributionStockListDTO.getMaterialIdName())
+				.eq(DistributionStockListEntity::getMaterialId, distributionStockListDTO.getMaterialId())
 				.eq(DistributionStockListEntity::getMarketId, distributionStockListDTO.getMarketId())
 				.eq(ObjectUtil.isNotEmpty(distributionStockListDTO.getStoreId()), DistributionStockListEntity::getStoreId, distributionStockListDTO.getStoreId())
 			);