增加盘点批次中对包件商场的判断

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-pref";
 
 	/**
 	 * 工厂对接服务名称

blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java

@@ -13,5 +13,10 @@ public class RedisKeyConstant {
 	 */
 	public static final String CACHE_OLD_SYSTEM_ORDERPACKAGE_KEY ="cache:old-system-orderpackage-key:";
 
+	/**
+	 * 缓存盘点包件的子任务
+	 */
+	public static final String TASK_QUEST_CHILD_KEY ="cache:task-quest-child-key:";
+
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 在库订单包件清单 Feign接口类
@@ -118,4 +119,14 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/updateOrderPackageCodeById")
     void updateOrderPackageCodeById(@RequestParam Long packageId, @RequestParam String orderPackageStatus);
+
+	/**
+	 * 根据包条码和仓库ID查询订单相关信息
+	 * @param orderPackCode 包条码
+	 * @param warehouseId 仓库ID
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/findByOrderInfoByOrderPackageCodeAndWarehouseId")
+	Map<String,Object> findByOrderInfoByOrderPackageCodeAndWarehouseId(@RequestParam  String orderPackCode,@RequestParam Long warehouseId);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -16,16 +16,19 @@
  */
 package com.logpm.distribution.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
 import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -34,7 +37,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 在库订单包件清单 Feign实现类
@@ -45,6 +50,7 @@ import java.util.List;
 @ApiIgnore()
 @RestController
 @AllArgsConstructor
+@Slf4j
 public class DistributionParcelListClient implements IDistributionParcelListClient {
 
     private final IDistributionParcelListService distributionParcelListService;
@@ -219,4 +225,28 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
 
 	}
+
+	@Override
+	public Map<String, Object> findByOrderInfoByOrderPackageCodeAndWarehouseId(String orderPackCode, Long warehouseId) {
+
+		LambdaQueryWrapper<DistributionParcelListEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(DistributionParcelListEntity::getOrderPackageCode,orderPackCode);
+		lambdaQueryWrapper.eq(DistributionParcelListEntity::getWarehouseId,warehouseId);
+		// 得到包件
+		try{
+			DistributionParcelListEntity one = distributionParcelListService.getOne(lambdaQueryWrapper);
+
+			//查询订单信息
+			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleService.getById(one.getStockArticleId());
+
+			Map<String, Object> map = new HashMap<>();
+			map.put("mallName",distributionStockArticleEntity.getMallName());
+			return map;
+		}catch (Exception e){
+			log.error(" >>>>>>> findByOrderInfoByOrderPackageCodeAndWarehouseId 查询异常",e);
+		}
+		return null;
+
+
+	}
 }