fix:

1.增加盘点新托盘名称

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java

@@ -216,6 +216,12 @@ public class QuestDetailEntity extends TenantEntity {
 	@ApiModelProperty(value = "新托盘编码")
 	private String newTrayCode;
 
+	/**
+	 * 新托盘名称
+	 */
+	@ApiModelProperty(value = "新托盘名称")
+	private String newTrayName;
+
 	/**
 	 * 货位id
 	 */

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java

@@ -129,6 +129,7 @@ public class WarehouseTaskApiController {
 	 */
 	@PostMapping("/addDataInfo")
 	public R addDataInfo(@RequestBody TaskSearchDTO taskSearchDTO){
+
 		//当前登录人选择的仓库
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if(Objects.isNull(myCurrentWarehouse)){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -110,6 +110,7 @@
         `grounding_allocation_id` bigint(20) NULL DEFAULT NULL COMMENT '上架后的库位ID',
         `new_tray_id` bigint(20) NULL DEFAULT NULL COMMENT '新托盘ID',
         `new_tray_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT  '新托盘编码',
+        `new_tray_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT  '新托盘名称',
         `is_new` int(20) NULL DEFAULT 0 COMMENT '是否是新增数据',
         `is_change` int(4) NULL DEFAULT 0 COMMENT '是否有变更 0未变更 1有变更',
         `is_change_at` int(4) NULL DEFAULT 0 COMMENT '是否有变更库位托盘 0未变更 1有变更',
@@ -301,6 +302,7 @@
         update ${questNum} set quest_status = #{param.questStatus}
         WHERE `id` = #{ param.id }
     </update>
+
     <update id="updatePositionCodeList" parameterType="com.logpm.warehouse.entity.QuestDetailEntity">
         <foreach collection="list" separator=";" item="item" index="index" open="" close="">
             update ${questNum}
@@ -325,6 +327,7 @@
                   <if test="item.isChange != null ">is_change = #{item.isChange }, </if>
                   <if test="item.newTrayId != null ">new_tray_id = #{item.newTrayId }, </if>
                   <if test="item.newTrayCode != null ">new_tray_code = #{item.newTrayCode }, </if>
+                  <if test="item.newTrayName != null ">new_tray_name = #{item.newTrayName }, </if>
                   <if test="item.isChangeAt != null ">is_change_at = #{item.isChangeAt }, </if>
                 <!--  <if test="item. != null and item. != null"> = #{item. }</if>
                   <if test="item. != null and item. != null"> = #{item. }</if>

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

@@ -750,6 +750,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	 * @return
 	 */
 	@Override
+
 	public R addDataInfo(TaskSearchDTO taskSearchDTO) {
 		log.info("开始添加数据{}", taskSearchDTO.toString());
 		String questNum = taskSearchDTO.getQuestNum();
@@ -801,7 +802,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		}
 		//处理盘点的包件
 		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", 2);
-
 		if (ObjectUtils.isNotNull(taskSearchDTO.getQuestDetailList())) {
 			List<QuestDetailEntity> detailEntityList = new ArrayList<>();
 			//处理的包件
@@ -931,6 +931,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 					questDetail.setIsChangeAt(1);
 					questDetail.setNewTrayId(i.getNewTrayId());
 					questDetail.setNewTrayCode(i.getNewTrayCode());
+					// 通过托盘ID 查询托盘名称
+					if(ObjectUtils.isNotNull(i.getNewTrayCode())){
+						BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(i.getNewTrayCode());
+						questDetail.setNewTrayName(trayEntity.getPalletName());
+					}
+
 					questDetail.setGroundingAllocationId(i.getGroundingAllocationId());
 					questDetail.setGroundingPositionCode(i.getGroundingPositionCode());
 					questDetail.setInventoryTime(new Date());
@@ -1721,22 +1727,27 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				//添加扫描的托盘信息
 				//添加托盘上面的数据
 				int taskInventory = getTaskInventory(taskSearchDTO, collect.get(0), trayByTrayCode);
+				try {
 					switch (taskInventory) {
 						case 0:
 							log.debug("全仓盘点");
 							//返回托盘信息
-						return getTrayInfo(trayByTrayCode.getId(), myCurrentWarehouse.getId(), trayByTrayCode.getPalletCode());
+							return R.data(getTrayInfo(trayByTrayCode.getId(), myCurrentWarehouse.getId(), trayByTrayCode.getPalletCode()));
 						case 1:
 							List<QuestDetailEntity> questDetailList = getQuestDetailList(taskSearchDTO, myCurrentWarehouse.getId(), trayByTrayCode.getId());
 							return R.data(getTaskTrayInfo(questDetailList));
 						case 2:
 							//返回托盘信息
-						return getTrayInfo(trayByTrayCode.getId(), myCurrentWarehouse.getId(), trayByTrayCode.getPalletCode());
+							return R.data(getTrayInfo(trayByTrayCode.getId(), myCurrentWarehouse.getId(), trayByTrayCode.getPalletCode()));
 						case 3:
 							return Resp.scanFail("无包件信息！", "无包件信息！");
 						default:
 							return Resp.scanFail("注意，注意：未知查询！", "注意，注意：未知查询！");
 					}
+				} catch (ServiceException e) {
+					return Resp.scanFail(e.getMessage(), e.getMessage());
+				}
+
 			}
 
 		} else {
@@ -1752,9 +1763,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 	//查询托盘信息
-	public R getTrayInfo(Long trayId, Long warehouseId, String taryCode) {
+	public TaskTrayVO getTrayInfo(Long trayId, Long warehouseId, String taryCode) {
 		//返回托盘信息
-		List<TaskTrayVO> trayVO = new ArrayList<>();
+//		List<TaskTrayVO> trayVO = new ArrayList<>();
 		WarehouseTrayTypeEntity one = trayTypeService.getOne(Wrappers.<WarehouseTrayTypeEntity>query().lambda()
 			.eq(WarehouseTrayTypeEntity::getTrayId, trayId)
 			.eq(WarehouseTrayTypeEntity::getIsDeleted, 0)
@@ -1771,7 +1782,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				taskTrayVO.setGoodsType(one.getType()); // 没有类型
 			} else {
 				//不是
-				return Resp.scanFail("此托盘不在当前仓库！", "此托盘不在当前仓库！");
+//				return Resp.scanFail("此托盘不在当前仓库！", "此托盘不在当前仓库！");
+				throw new ServiceException("此托盘不在当前仓库！");
 			}
 		} else {
 			//没有绑定可以使用
@@ -1781,8 +1793,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			taskTrayVO.setUnTotal(0);
 			taskTrayVO.setGoodsType("定制品"); // 定制品
 		}
-		trayVO.add(taskTrayVO);
-		return R.data(trayVO);
+//		trayVO.add(taskTrayVO);
+		return taskTrayVO;
 	}
 
 
@@ -3380,7 +3392,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		return datas;
 
 
-
 	}
 
 	@Override
@@ -3426,5 +3437,4 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 	}
 
 
-
 }