修改合同扫描

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

@@ -1140,7 +1140,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		for (QuestDetailEntity questDetailEntity : questDetailEntities) {
 			TaskPackagelistVO packagelistVO = new TaskPackagelistVO();
 			BeanUtil.copyProperties(questDetailEntity, packagelistVO);
-			packagelistVO.setAllocation(questDetailEntity.getPositionCode());
+			if(ObjectUtils.isNotNull(questDetailEntity.getGroundingPositionCode())){
+				packagelistVO.setAllocation(questDetailEntity.getGroundingPositionCode());
+			}else{
+				packagelistVO.setAllocation(questDetailEntity.getPositionCode());
+			}
 			if(taskSearchDTO.getTypeState().equals(1)){
 				//有
 				if(questDetailEntity.getQuestTarget().equals(2) || ObjectUtils.isNull( questDetailEntity.getOrderPackageId())){
@@ -1230,7 +1234,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		if (Func.isEmpty(questDetailEntityList)){
 			return null;
 		}
-		/*Map<Integer, List<QuestDetailEntity>> questDetailMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget));
+		Map<Integer, List<QuestDetailEntity>> questDetailMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget));
 		//订制品
 		List<QuestDetailEntity> questDetailEntities = questDetailMap.get(1);
 		List<QuestDetailEntity> zeroQuestDetailEntities = questDetailMap.get(2);
@@ -1288,7 +1292,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				}
 				list.add(taskContractVO);
 			}
-		}*/
+		}
 
 		return taskPageList.setRecords(list);
 	}
@@ -2410,6 +2414,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}", goodsAreaId);
 			throw new CustomerException(403, "货区信息不存在");
 		}
+		TaskQuestEntity taskQuestEntity = baseMapper.selectById(questId);
+
+		QuestDetailEntity questDetail = new QuestDetailEntity();
+		questDetail.setAllocationId(String.valueOf(allocationId));
+		List<QuestDetailEntity> list = baseMapper.selectTaskInfo(taskQuestEntity.getQuestNum(), questDetail);
+
+		if(!list.isEmpty()){
+			for (QuestDetailEntity i : list) {
+				if(ObjectUtils.isNull(i.getGroundingPositionCode())){
+					log.info("当前库位已有数据，无法绑定！！");
+					return R.success("当前库位已有数据，无法绑定！！");
+				}
+			}
+		}
 		String positionCode = goodsAreaEntity.getHeadline() + "-" + basicdataGoodsShelfEntity.getGoodsShelfName() + "-" + goodsAllocationEntity.getGoodsAllocationName();
 
 		Map<String,Object> map = new HashMap<>();