Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinPickupServiceImpl.java

shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinPickupServiceImpl.java

@@ -754,8 +754,7 @@ public class BusinPickupServiceImpl extends ServiceImpl<BusinPickupMapper, Busin
         Result<Boolean> booleanResult = iBusinEnptyContainerService.emptyContainerFlowDir(point, businPickupAddBo.getContainerId(), agvno, null);
         if (Result.isOk(booleanResult)){
             log.info("小组装放行完成："+point+" AGV编号："+agvno+" 任务号:"+businPickupAddBo.getTaskCode());
-            redisTemplate.opsForValue().set("xzz:"+DataTask.getId(),agvno,3,TimeUnit.MINUTES); //修改为3分钟
+            redisTemplate.opsForValue().set("xzz:"+DataTask.getId(),agvno,5,TimeUnit.MINUTES);
-            log.info("方法[savePickupRecordByAssemblyLine]设置redis=> xzz:"+DataTask.getId()+",agv_no:"+agvno);
             DataTask.setTaskStatus("2");
             businDataTaskService.updateById(DataTask);