Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -305,6 +306,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			if (ObjectUtils.isNotNull(stockArticleEntity)) {
 				detailEntity.setMarketName(stockArticleEntity.getMallName());
 			}
+		}else{
+			detailEntity.setMarketName(i.getMallName());
 		}
 		detailEntity.setIncomingBatch(i.getOrderCode());
 		return detailEntity;
@@ -2945,7 +2948,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		questDetail.setMarketNames(marketNames);
 
 		List<QuestDetailEntity> questDetailEntityList = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(), questDetail);
-		if (questDetailEntityList.isEmpty() || ObjectUtils.isNull(questDetailEntityList) || ObjectUtils.isNull(questDetailEntityList.get(0).getQuestId())) {
+		if (CollUtil.isEmpty(questDetailEntityList)) {
 
 			// 需要判读这个盘点任务 是否存在绑定的商场
 			R<Object> extracted = extracted(questId, questDetail);
@@ -2955,8 +2958,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 //			需要去业务系统上进行查询信息
 			List<DistributionParcelListEntity> byPacketBarCode = distributionParcelListClient.findByPacketBarCode(questDetail.getOrderPackageCode());
-
-			if (ObjectUtils.isEmpty(byPacketBarCode)) {
+//			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(questDetail.getOrderPackageCode(), warehouseId);
+			if (CollUtil.isEmpty(byPacketBarCode)) {
 				return R.fail(5000, "包件信息不存在！！");
 			} else {
 				for (DistributionParcelListEntity distributionParcelListEntity : byPacketBarCode) {